From abf537e34831da5df19d2f7277a7a760dad63ec2 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Mon, 20 Oct 2014 22:34:22 +0400 Subject: [PATCH] J2K: conversion with usage processing across multiple converted files works in tests (but not in real life yet) --- .../jet/generators/tests/GenerateTests.kt | 17 +- .../plugin/actions/JavaToKotlinAction.java | 10 +- .../actions/JavaToKotlinActionUtil.java | 7 +- .../copy/ConvertJavaCopyPastePostProcessor.kt | 10 +- j2k/src/org/jetbrains/jet/j2k/Converter.kt | 25 +- .../jet/j2k/JavaToKotlinConverter.kt | 60 +- .../jet/j2k/JavaToKotlinTranslator.kt | 4 +- ...tractJavaToKotlinConverterMultiFileTest.kt | 68 + ...ractJavaToKotlinConverterSingleFileTest.kt | 149 ++ .../test/AbstractJavaToKotlinConverterTest.kt | 164 +- ...otlinConverterForWebDemoTestGenerated.java | 1388 +++++++-------- ...KotlinConverterMultiFileTestGenerated.java | 46 + ...tlinConverterSingleFileTestGenerated.java} | 1530 +++++++++-------- .../annotations/annotationInterface1.java | 0 .../annotations/annotationInterface1.kt | 0 .../annotations/annotationInterface2.java | 0 .../annotations/annotationInterface2.kt | 0 .../annotations/annotationInterface3.java | 0 .../annotations/annotationInterface3.kt | 0 .../annotations/annotationUsages.java | 0 .../annotations/annotationUsages.kt | 0 .../annotations/jetbrainsNotNull.java | 0 .../annotations/jetbrainsNotNull.kt | 0 .../jetbrainsNotNullChainExpr.java | 0 .../annotations/jetbrainsNotNullChainExpr.kt | 0 .../annotations/jetbrainsNullable.java | 0 .../annotations/jetbrainsNullable.kt | 0 .../anonymousBlock/oneAnonBlock.java | 0 .../anonymousBlock/oneAnonBlock.kt | 0 .../anonymousBlock/oneStaticAnonBlock.java | 0 .../anonymousBlock/oneStaticAnonBlock.kt | 0 .../expressionIndex.java | 0 .../arrayAccessExpression/expressionIndex.kt | 0 .../arrayAccessExpression/intIndex.java | 0 .../arrayAccessExpression/intIndex.kt | 0 .../arrayAccessExpression/variableIndex.java | 0 .../arrayAccessExpression/variableIndex.kt | 0 .../doubleArray.java | 0 .../arrayInitializerExpression/doubleArray.kt | 0 .../doubleArrayWithVariables.java | 0 .../doubleArrayWithVariables.kt | 0 .../floatArray.java | 0 .../arrayInitializerExpression/floatArray.kt | 0 .../intArrayWithLength.java | 0 .../intArrayWithLength.kt | 0 .../javaLangDoubleArray.java | 0 .../javaLangDoubleArray.kt | 0 .../javaLangFloatArray.java | 0 .../javaLangFloatArray.kt | 0 .../arrayInitializerExpression/newByte.java | 0 .../arrayInitializerExpression/newByte.kt | 0 .../arrayInitializerExpression/newInt.java | 0 .../arrayInitializerExpression/newInt.kt | 0 .../objectArrayWithLength.java | 0 .../objectArrayWithLength.kt | 0 .../arrayInitializerExpression/oneDim.java | 0 .../arrayInitializerExpression/oneDim.kt | 0 .../oneDimWithVariables.java | 0 .../oneDimWithVariables.kt | 0 .../arrayInitializerExpression/twoDim.java | 0 .../arrayInitializerExpression/twoDim.kt | 0 .../arrayInitializationStatement.java | 0 .../arrayType/arrayInitializationStatement.kt | 0 ...yInitializationStatementWithDimension.java | 0 ...rayInitializationStatementWithDimension.kt | 0 ...nitializationStatementWithDimension3d.java | 0 ...yInitializationStatementWithDimension3d.kt | 0 ...izationStatementWithDimensionExplicit.java | 0 ...alizationStatementWithDimensionExplicit.kt | 0 .../arrayType/d2StringEmptyArray.java | 0 .../arrayType/d2StringEmptyArray.kt | 0 .../arrayType/d3StringEmptyArray.java | 0 .../arrayType/d3StringEmptyArray.kt | 0 .../arrayType/longArray.java | 0 .../arrayType/longArray.kt | 0 .../arrayType/methodArrayArgs.java | 0 .../arrayType/methodArrayArgs.kt | 0 .../arrayType/newIntArray.java | 0 .../arrayType/newIntArray.kt | 0 .../arrayType/newStringArray.java | 0 .../arrayType/newStringArray.kt | 0 .../assertStatement/onlyCondition.java | 0 .../assertStatement/onlyCondition.kt | 0 .../onlyConditionWithBraces.java | 0 .../onlyConditionWithBraces.kt | 0 .../assertStatement/withStringDetail.java | 0 .../assertStatement/withStringDetail.kt | 0 .../assertStatement/withStringDetail2.java | 0 .../assertStatement/withStringDetail2.kt | 0 .../assignmentExpression/and.java | 0 .../assignmentExpression/and.kt | 0 .../assignmentExpression/assignment.java | 0 .../assignmentExpression/assignment.kt | 0 .../assignmentExpression/divideAssign.java | 0 .../assignmentExpression/divideAssign.kt | 0 .../assignmentExpression/minusAssign.java | 0 .../assignmentExpression/minusAssign.kt | 0 .../assignmentExpression/multiplyAssign.java | 0 .../assignmentExpression/multiplyAssign.kt | 0 .../nullability-settings.java | 0 .../nullability-settings.kt | 0 .../assignmentExpression/nullability.java | 0 .../assignmentExpression/nullability.kt | 0 .../assignmentExpression/or.java | 0 .../assignmentExpression/or.kt | 0 .../assignmentExpression/plusAssign.java | 0 .../assignmentExpression/plusAssign.kt | 0 .../assignmentExpression/reminder.java | 0 .../assignmentExpression/reminder.kt | 0 .../assignmentExpression/shiftLeft.java | 0 .../assignmentExpression/shiftLeft.kt | 0 .../assignmentExpression/shiftRight.java | 0 .../assignmentExpression/shiftRight.kt | 0 .../simpleAssignment.java | 0 .../assignmentExpression/simpleAssignment.kt | 0 .../unsignedRightShift.java | 0 .../unsignedRightShift.kt | 0 .../assignmentExpression/xor.java | 0 .../assignmentExpression/xor.kt | 0 .../binaryExpression/and.java | 0 .../binaryExpression/and.kt | 0 .../binaryExpression/conditionalAnd.java | 0 .../binaryExpression/conditionalAnd.kt | 0 .../binaryExpression/conditionalOr.java | 0 .../binaryExpression/conditionalOr.kt | 0 .../binaryExpression/divide.java | 0 .../binaryExpression/divide.kt | 0 .../binaryExpression/greaterThan.java | 0 .../binaryExpression/greaterThan.kt | 0 .../binaryExpression/greaterThanEqual.java | 0 .../binaryExpression/greaterThanEqual.kt | 0 .../binaryExpression/lessThan.java | 0 .../binaryExpression/lessThan.kt | 0 .../binaryExpression/lessThanEqual.java | 0 .../binaryExpression/lessThanEqual.kt | 0 .../binaryExpression/minus.java | 0 .../binaryExpression/minus.kt | 0 .../binaryExpression/multiplePlusMinus.java | 0 .../binaryExpression/multiplePlusMinus.kt | 0 .../binaryExpression/multiply.java | 0 .../binaryExpression/multiply.kt | 0 .../binaryExpression/or.java | 0 .../binaryExpression/or.kt | 0 .../binaryExpression/plus.java | 0 .../binaryExpression/plus.kt | 0 .../binaryExpression/remainder.java | 0 .../binaryExpression/remainder.kt | 0 .../binaryExpression/shiftLeft.java | 0 .../binaryExpression/shiftLeft.kt | 0 .../binaryExpression/shiftRight.java | 0 .../binaryExpression/shiftRight.kt | 0 .../binaryExpression/unsignedRightShift.java | 0 .../binaryExpression/unsignedRightShift.kt | 0 .../binaryExpression/xor.java | 0 .../binaryExpression/xor.kt | 0 .../{ast => fileOrElement}/blocks/Blocks.java | 0 .../{ast => fileOrElement}/blocks/Blocks.kt | 0 .../boxedType/Boxing.java | 0 .../boxedType/Boxing.kt | 0 .../boxedType/boolean.java | 0 .../boxedType/boolean.kt | 0 .../boxedType/byte.java | 0 .../{ast => fileOrElement}/boxedType/byte.kt | 0 .../boxedType/character.java | 0 .../boxedType/character.kt | 0 .../boxedType/double.java | 0 .../boxedType/double.kt | 0 .../boxedType/float.java | 0 .../{ast => fileOrElement}/boxedType/float.kt | 0 .../boxedType/integer.java | 0 .../boxedType/integer.kt | 0 .../boxedType/kt-671.java | 0 .../boxedType/kt-671.kt | 0 .../boxedType/long.java | 0 .../{ast => fileOrElement}/boxedType/long.kt | 0 .../boxedType/object.java | 0 .../boxedType/object.kt | 0 .../boxedType/short.java | 0 .../{ast => fileOrElement}/boxedType/short.kt | 0 .../breakStatement/breakWithLabel.java | 0 .../breakStatement/breakWithLabel.kt | 0 .../breakStatement/breakWithoutLabel.java | 0 .../breakStatement/breakWithoutLabel.kt | 0 .../callChainExpression/libraryFieldCall.java | 0 .../callChainExpression/libraryFieldCall.kt | 0 .../libraryMethodCall.java | 0 .../callChainExpression/libraryMethodCall.kt | 0 ...ibraryMethodCallFromInstance-settings.java | 0 .../libraryMethodCallFromInstance-settings.kt | 0 .../libraryMethodCallFromInstance.java | 0 .../libraryMethodCallFromInstance.kt | 0 .../libraryStringFieldCall.java | 0 .../libraryStringFieldCall.kt | 0 .../callChainExpression/sout.java | 0 .../callChainExpression/sout.kt | 0 .../class/ClassShadowing.java | 0 .../class/ClassShadowing.kt | 0 .../class/abstractClass.java | 0 .../class/abstractClass.kt | 0 .../class/abstractClassShape.java | 0 .../class/abstractClassShape.kt | 0 .../{ast => fileOrElement}/class/class.java | 0 .../{ast => fileOrElement}/class/class.kt | 0 .../class/classWithEmptyMethods.java | 0 .../class/classWithEmptyMethods.kt | 0 .../class/classWithFields.java | 0 .../class/classWithFields.kt | 0 .../class/classWithMultiplyFields.java | 0 .../class/classWithMultiplyFields.kt | 0 .../class/emptyClass.java | 0 .../class/emptyClass.kt | 0 ...endsOneClassAndImplementsOneInterface.java | 0 ...xtendsOneClassAndImplementsOneInterface.kt | 0 ...neClassAndImplementsSeveralInterfaces.java | 0 ...sOneClassAndImplementsSeveralInterfaces.kt | 0 .../class/finalClass.java | 0 .../class/finalClass.kt | 0 .../class/genericClass.java | 0 .../class/genericClass.kt | 0 .../class/innerClassInInterface.java | 0 .../class/innerClassInInterface.kt | 0 .../class/innerEmptyClass.java | 0 .../class/innerEmptyClass.kt | 0 .../class/innerEnum.java | 0 .../{ast => fileOrElement}/class/innerEnum.kt | 0 .../class/innerInterface.java | 0 .../class/innerInterface.kt | 0 .../class/innerStaticClass.java | 0 .../class/innerStaticClass.kt | 0 .../class/internalClass.java | 0 .../class/internalClass.kt | 0 .../{ast => fileOrElement}/class/kt-639.java | 0 .../{ast => fileOrElement}/class/kt-639.kt | 0 .../class/oneStaticFieldOneNonStatic.java | 0 .../class/oneStaticFieldOneNonStatic.kt | 0 .../class/oneStaticMethod.java | 0 .../class/oneStaticMethod.kt | 0 .../class/oneStaticMethodOneNonStatic.java | 0 .../class/oneStaticMethodOneNonStatic.kt | 0 .../class/pivateClass.java | 0 .../class/pivateClass.kt | 0 .../class/privateInit.java | 0 .../class/privateInit.kt | 0 .../class/protectedClass.java | 0 .../class/protectedClass.kt | 0 .../class/publicClass.java | 0 .../class/publicClass.kt | 0 .../class/simpleInheritance.java | 0 .../class/simpleInheritance.kt | 0 .../class/twoStaticMethod.java | 0 .../class/twoStaticMethod.kt | 0 .../classExpression/complexExample.java | 0 .../classExpression/complexExample.kt | 0 .../classExpression/objectClass.java | 0 .../classExpression/objectClass.kt | 0 .../classExpression/primitivesAndArrays.java | 0 .../classExpression/primitivesAndArrays.kt | 0 .../classExpression/stringClass.java | 0 .../classExpression/stringClass.kt | 0 .../comments/comments.java | 0 .../comments/comments.kt | 0 .../comments/comments.kt.todo | 0 .../comments/comments2.java | 0 .../comments/comments2.kt | 0 .../comments/commentsForConstructors.java | 0 .../comments/commentsForConstructors.kt | 0 .../comments/fieldWithEndOfLineComment.java | 0 .../comments/fieldWithEndOfLineComment.kt | 0 .../comments/fieldsInitializedFromParams.java | 0 .../comments/fieldsInitializedFromParams.kt | 0 .../conditionalExpression/multiline.java | 0 .../conditionalExpression/multiline.kt | 0 .../conditionalExpression/simple.java | 0 .../conditionalExpression/simple.kt | 0 .../constructors/allCallsPrimary.java | 0 .../constructors/allCallsPrimary.kt | 0 .../constructors/allCallsPrimary2.java | 0 .../constructors/allCallsPrimary2.kt | 0 .../constructors/artificialPrimary.java | 0 .../constructors/artificialPrimary.kt | 0 .../constructors/chain.java | 0 .../constructors/chain.kt | 0 .../constructors/constructorAnnotations.java | 0 .../constructors/constructorAnnotations.kt | 0 .../constructors/customerBuilder.java | 0 .../constructors/customerBuilder.kt | 0 .../fieldsInitializedFromParams1.java | 0 .../fieldsInitializedFromParams1.kt | 0 .../fieldsInitializedFromParams2.java | 0 .../fieldsInitializedFromParams2.kt | 0 .../fieldsInitializedFromParams3.java | 0 .../fieldsInitializedFromParams3.kt | 0 .../fieldsInitializedFromParams4.java | 0 .../fieldsInitializedFromParams4.kt | 0 .../fieldsInitializedFromParams5.java | 0 .../fieldsInitializedFromParams5.kt | 0 .../fieldsInitializedFromParams6.java | 0 .../fieldsInitializedFromParams6.kt | 0 .../fieldsInitializedFromParams7.java | 0 .../fieldsInitializedFromParams7.kt | 0 .../fieldsInitializedFromParams8.java | 0 .../fieldsInitializedFromParams8.kt | 0 .../fieldsInitializedFromParams9.java | 0 .../fieldsInitializedFromParams9.kt | 0 .../constructors/genericIdentifier.java | 0 .../constructors/genericIdentifier.kt | 0 .../constructors/identifier.java | 0 .../constructors/identifier.kt | 0 .../constructors/methodCallInFactoryFun.java | 0 .../constructors/methodCallInFactoryFun.kt | 0 .../nestedClassNameInParameterDefaults.java | 0 .../nestedClassNameInParameterDefaults.kt | 0 .../nestedClassNameInParameterDefaults2.java | 0 .../nestedClassNameInParameterDefaults2.kt | 0 .../nestedClassNameInParameterDefaults3.java | 0 .../nestedClassNameInParameterDefaults3.kt | 0 .../nestedClassNameInParameterDefaults4.java | 0 .../nestedClassNameInParameterDefaults4.kt | 0 .../nestedClassNameInSuperParameters.java | 0 .../nestedClassNameInSuperParameters.kt | 0 .../constructors/noPrimary.java | 0 .../constructors/noPrimary.kt | 0 .../constructors/parameterDefaults1.java | 0 .../constructors/parameterDefaults1.kt | 0 .../constructors/parameterDefaults2.java | 0 .../constructors/parameterDefaults2.kt | 0 .../constructors/parameterDefaults3.java | 0 .../constructors/parameterDefaults3.kt | 0 .../constructors/parameterDefaults4.java | 0 .../constructors/parameterDefaults4.kt | 0 .../constructors/parameterDefaults5.java | 0 .../constructors/parameterDefaults5.kt | 0 .../constructors/parameterModification.java | 0 .../constructors/parameterModification.kt | 0 .../constructors/privateConstructors.java | 0 .../constructors/privateConstructors.kt | 0 .../qualifiedRefInFactoryFun.java | 0 .../constructors/qualifiedRefInFactoryFun.kt | 0 .../secondaryConstructorsInInnerClass.java | 0 .../secondaryConstructorsInInnerClass.kt | 0 .../secondaryConstructorsInNestedClass.java | 0 .../secondaryConstructorsInNestedClass.kt | 0 .../secondaryConstructorsVisibility.java | 0 .../secondaryConstructorsVisibility.kt | 0 .../staticFieldRefInFactoryFun.java | 0 .../staticFieldRefInFactoryFun.kt | 0 .../constructors/withManyDefaultParams.java | 0 .../constructors/withManyDefaultParams.kt | 0 .../continueStatement/continueWithLabel.java | 0 .../continueStatement/continueWithLabel.kt | 0 .../continueWithoutLabel.java | 0 .../continueStatement/continueWithoutLabel.kt | 0 .../multiplyFinalIntDeclaration.java | 0 .../multiplyFinalIntDeclaration.kt | 0 .../multiplyIntDeclaration.java | 0 .../multiplyIntDeclaration.kt | 0 .../singleFinalIntDeclaration.java | 0 .../singleFinalIntDeclaration.kt | 0 .../singleFinalStringDeclaration.java | 0 .../singleFinalStringDeclaration.kt | 0 .../singleIntDeclaration.java | 0 .../singleIntDeclaration.kt | 0 .../singleStringDeclaration.java | 0 .../singleStringDeclaration.kt | 0 .../doWhileStatement/whileWithBlock.java | 0 .../doWhileStatement/whileWithBlock.kt | 0 .../doWhileStatement/whileWithEmptyBlock.java | 0 .../doWhileStatement/whileWithEmptyBlock.kt | 0 .../doWhileStatement/whileWithExpression.java | 0 .../doWhileStatement/whileWithExpression.kt | 0 .../doWhileStatement/whileWithReturn.java | 0 .../doWhileStatement/whileWithReturn.kt | 0 .../dropAccessors/AccessInGetterWithThis.java | 0 .../dropAccessors/AccessInGetterWithThis.kt | 0 .../dropAccessors/CannotDropOnlySetter.java | 0 .../dropAccessors/CannotDropOnlySetter.kt | 0 .../dropAccessors/DataClass.java | 0 .../dropAccessors/DataClass.kt | 0 .../DataClassWithMutableField.java | 0 .../DataClassWithMutableField.kt | 0 .../dropAccessors/DifferentFieldName.java | 0 .../dropAccessors/DifferentFieldName.kt | 0 ...rentFieldNameAndDefaultParameterValue.java | 0 ...ferentFieldNameAndDefaultParameterValue.kt | 0 .../DifferentFieldNameAndSuperClass.java | 0 .../DifferentFieldNameAndSuperClass.kt | 0 .../DifferentProtectedFieldName.java | 0 .../DifferentProtectedFieldName.kt | 0 .../dropAccessors/DropGetter.java | 0 .../dropAccessors/DropGetter.kt | 0 .../dropAccessors/DropGetterAndSetter.java | 0 .../dropAccessors/DropGetterAndSetter.kt | 0 .../dropAccessors/DropGetterForMutable.java | 0 .../dropAccessors/DropGetterForMutable.kt | 0 .../dropAccessors/FalseGetter.java | 0 .../dropAccessors/FalseGetter.kt | 0 .../dropAccessors/FalseSetter.java | 0 .../dropAccessors/FalseSetter.kt | 0 .../FieldUsagesInFactoryMethods.java | 0 .../FieldUsagesInFactoryMethods.kt | 0 .../GetterAndSetterNamesDifferent.java | 0 .../GetterAndSetterNamesDifferent.kt | 0 .../dropAccessors/GetterSetterUsages.java | 0 .../dropAccessors/GetterSetterUsages.kt | 0 .../QualifyFieldUsagesOnRename.java.todo | 0 .../enum/colorEnum.java | 0 .../{ast => fileOrElement}/enum/colorEnum.kt | 0 .../enum/emptyEnum.java | 0 .../{ast => fileOrElement}/enum/emptyEnum.kt | 0 .../enum/enumConstantIsNotNull.java | 0 .../enum/enumConstantIsNotNull.kt | 0 .../enum/enumImplementsOneInterface.java | 0 .../enum/enumImplementsOneInterface.kt | 0 .../enum/enumImplementsSeveralInterfaces.java | 0 .../enum/enumImplementsSeveralInterfaces.kt | 0 .../enum/enumWithNameField.java | 0 .../enum/enumWithNameField.kt | 0 .../fieldsWithPrimaryPrivateConstructor.java | 0 .../fieldsWithPrimaryPrivateConstructor.kt | 0 .../enum/internalEnum.java | 0 .../enum/internalEnum.kt | 0 .../enum/overrideToString.java | 0 .../enum/overrideToString.kt | 0 .../enum/primaryPrivateConstructor.java | 0 .../enum/primaryPrivateConstructor.kt | 0 .../enum/privateEnum.java | 0 .../enum/privateEnum.kt | 0 .../enum/protectedEnum.java | 0 .../enum/protectedEnum.kt | 0 .../enum/publicEnum.java | 0 .../{ast => fileOrElement}/enum/publicEnum.kt | 0 .../enum/runnableImplementation.java | 0 .../enum/runnableImplementation.kt | 0 .../enum/typeSafeEnum.java | 0 .../enum/typeSafeEnum.kt | 0 .../equals/Equals1.java | 0 .../{ast => fileOrElement}/equals/Equals1.kt | 0 .../equals/Equals2.java | 0 .../{ast => fileOrElement}/equals/Equals2.kt | 0 .../equals/Equals3.java | 0 .../{ast => fileOrElement}/equals/Equals3.kt | 0 .../equals/Equals4.java | 0 .../{ast => fileOrElement}/equals/Equals4.kt | 0 .../equals/ObjectsEquals.java | 0 .../equals/ObjectsEquals.kt | 0 .../field/classChildExtendsBase.java | 0 .../field/classChildExtendsBase.kt | 0 .../field/conversion.java | 0 .../field/conversion.kt | 0 .../field/internalField.java | 0 .../field/internalField.kt | 0 .../field/privateField.java | 0 .../field/privateField.kt | 0 .../field/protectedField.java | 0 .../field/protectedField.kt | 0 .../field/publicField.java | 0 .../field/publicField.kt | 0 .../field/specifyType.java | 0 .../field/specifyType.kt | 0 .../field/valOrVar.java | 0 .../{ast => fileOrElement}/field/valOrVar.kt | 0 .../field/valWithInit.java | 0 .../field/valWithInit.kt | 0 .../field/varWithInit.java | 0 .../field/varWithInit.kt | 0 .../field/varWithoutInit.java | 0 .../field/varWithoutInit.kt | 0 .../field/volatileTransientAndStrictFp.java | 0 .../field/volatileTransientAndStrictFp.kt | 0 .../for/commonCaseForTest.java | 0 .../for/commonCaseForTest.kt | 0 .../for/falseForRange.java | 0 .../for/falseForRange.kt | 0 .../for/forRangeWithBlock.java | 0 .../for/forRangeWithBlock.kt | 0 .../for/forRangeWithLE.java | 0 .../for/forRangeWithLE.kt | 0 .../for/forRangeWithLT.java | 0 .../for/forRangeWithLT.kt | 0 .../for/forThroughArrayIndices.java | 0 .../for/forThroughArrayIndices.kt | 0 .../for/forThroughListIndices.java | 0 .../for/forThroughListIndices.kt | 0 .../for/forThroughNonArrayIndices.java | 0 .../for/forThroughNonArrayIndices.kt | 0 .../for/forThroughNonCollectionIndices.java | 0 .../for/forThroughNonCollectionIndices.kt | 0 .../for/forWithBlock.java | 0 .../for/forWithBlock.kt | 0 .../for/forWithBlockAndDoubleUpdate.java | 0 .../for/forWithBlockAndDoubleUpdate.kt | 0 .../for/forWithEmptyBlock.java | 0 .../for/forWithEmptyBlock.kt | 0 .../for/forWithExpression.java | 0 .../for/forWithExpression.kt | 0 .../for/forWithNullCondition.java | 0 .../for/forWithNullCondition.kt | 0 .../for/forWithNullInit.java | 0 .../for/forWithNullInit.kt | 0 .../for/forWithNullUpdate.java | 0 .../for/forWithNullUpdate.kt | 0 .../for/forWithReturn.java | 0 .../for/forWithReturn.kt | 0 .../for/infiniteFor.java | 0 .../{ast => fileOrElement}/for/infiniteFor.kt | 0 .../enhancedForWithBlock.java | 0 .../foreachStatement/enhancedForWithBlock.kt | 0 .../enhancedForWithEmptyBlock.java | 0 .../enhancedForWithEmptyBlock.kt | 0 .../enhancedForWithExpression.java | 0 .../enhancedForWithExpression.kt | 0 .../enhancedForWithReturn.java | 0 .../foreachStatement/enhancedForWithReturn.kt | 0 .../foreachStatement/nullableIterable.java | 0 .../foreachStatement/nullableIterable.kt | 0 .../formatting/nonStaticMembers.java | 0 .../formatting/nonStaticMembers.kt | 0 .../nonStaticMembersWithComments.java | 0 .../nonStaticMembersWithComments.kt | 0 ...staticAndNonStaticMembersWithComments.java | 0 .../staticAndNonStaticMembersWithComments.kt | 0 .../formatting/staticMembersWithComments.java | 0 .../formatting/staticMembersWithComments.kt | 0 .../function/abstractMethod.java | 0 .../function/abstractMethod.kt | 0 .../function/classGenericParam.java | 0 .../function/classGenericParam.kt | 0 .../function/emptyVoidMethod.java | 0 .../function/emptyVoidMethod.kt | 0 .../extendsBaseWhichExtendsObject.java | 0 .../function/extendsBaseWhichExtendsObject.kt | 0 .../function/final.java | 0 .../{ast => fileOrElement}/function/final.kt | 0 .../function/functionInFinalClass.java | 0 .../function/functionInFinalClass.kt | 0 .../function/internal.java | 0 .../function/internal.kt | 0 .../{ast => fileOrElement}/function/main.java | 0 .../{ast => fileOrElement}/function/main.kt | 0 .../function/main2.java | 0 .../{ast => fileOrElement}/function/main2.kt | 0 .../function/mainAndNullabilitySetting.java | 0 .../function/mainAndNullabilitySetting.kt | 0 .../function/methodClassType.java | 0 .../function/methodClassType.kt | 0 .../function/methodPrimitiveType.java | 0 .../function/methodPrimitiveType.kt | 0 .../function/methodPrimitiveType2.java | 0 .../function/methodPrimitiveType2.kt | 0 .../function/methodWithReturnStatement.java | 0 .../function/methodWithReturnStatement.kt | 0 .../{ast => fileOrElement}/function/open.java | 0 .../{ast => fileOrElement}/function/open.kt | 0 .../function/override.java | 0 .../function/override.kt | 0 .../function/overrideAndOpen.java | 0 .../function/overrideAndOpen.kt | 0 .../function/overrideObject.java | 0 .../function/overrideObject.kt | 0 .../function/overrideObject2.java | 0 .../function/overrideObject2.kt | 0 .../function/overrideObject3.java | 0 .../function/overrideObject3.kt | 0 .../function/ownGenericParam.java | 0 .../function/ownGenericParam.kt | 0 .../function/ownSeveralGenericParams.java | 0 .../function/ownSeveralGenericParams.kt | 0 .../function/parameterModification.java | 0 .../function/parameterModification.kt | 0 .../function/private.java | 0 .../function/private.kt | 0 .../function/protected.java | 0 .../function/protected.kt | 0 .../function/public.java | 0 .../{ast => fileOrElement}/function/public.kt | 0 .../function/synchronizedMethod.java | 0 .../function/synchronizedMethod.kt | 0 .../function/throws.java | 0 .../{ast => fileOrElement}/function/throws.kt | 0 .../function/varVararg.java | 0 .../function/varVararg.kt | 0 .../identifier/finalFieldReference.java | 0 .../identifier/finalFieldReference.kt | 0 .../identifier/keywords.java | 0 .../identifier/keywords.kt | 0 .../identifier/withDollar.java | 0 .../identifier/withDollar.kt | 0 .../ifStatement/elseIf.java | 0 .../ifStatement/elseIf.kt | 0 .../ifStatement/multiLine.java | 0 .../ifStatement/multiLine.kt | 0 .../ifStatement/singleLine.java | 0 .../ifStatement/singleLine.kt | 0 .../ifStatement/withBlocks.java | 0 .../ifStatement/withBlocks.kt | 0 .../ifStatement/withEmptyBlocks.java | 0 .../ifStatement/withEmptyBlocks.kt | 0 .../ifStatement/withoutElse.java | 0 .../ifStatement/withoutElse.kt | 0 .../importStatement/importWithKeywords.java | 0 .../importStatement/importWithKeywords.kt | 0 .../importStatement/importWithStar.java | 0 .../importStatement/importWithStar.kt | 0 .../importStatement/oneImport.java | 0 .../importStatement/oneImport.kt | 0 .../importStatement/onlyImports.java | 0 .../importStatement/onlyImports.kt | 0 .../importStatement/simpleImport.java | 0 .../importStatement/simpleImport.kt | 0 .../inProjectionType/methodParams.java | 0 .../inProjectionType/methodParams.kt | 0 .../classOneExtendsBaseGeneric.java | 0 .../inheritance/classOneExtendsBaseGeneric.kt | 0 .../classOneExtendsBaseWithOneParam.java | 0 .../classOneExtendsBaseWithOneParam.kt | 0 .../classOneExtendsBaseWithZeroParams.java | 0 .../classOneExtendsBaseWithZeroParams.kt | 0 ...BaseWithZeroParamsNonEmptyConstructor.java | 0 ...dsBaseWithZeroParamsNonEmptyConstructor.kt | 0 .../isOperator/complicatedExpression.java | 0 .../isOperator/complicatedExpression.kt | 0 .../isOperator/simpleReference.java | 0 .../isOperator/simpleReference.kt | 0 .../issues/arrayLength.java | 0 .../issues/arrayLength.kt | 0 .../issues/comments.java | 0 .../{ast => fileOrElement}/issues/comments.kt | 0 .../issues/doNotQualifyStatic.java | 0 .../issues/doNotQualifyStatic.kt | 0 .../issues/kt-1016.java | 0 .../{ast => fileOrElement}/issues/kt-1016.kt | 0 .../issues/kt-1048.java | 0 .../{ast => fileOrElement}/issues/kt-1048.kt | 0 .../issues/kt-1074.java | 0 .../{ast => fileOrElement}/issues/kt-1074.kt | 0 .../issues/kt-5294.java | 0 .../{ast => fileOrElement}/issues/kt-5294.kt | 0 .../issues/kt-5400.java | 0 .../{ast => fileOrElement}/issues/kt-5400.kt | 0 .../issues/kt-543-boxed.java | 0 .../issues/kt-543-boxed.kt | 0 .../issues/kt-543-mixed.java | 0 .../issues/kt-543-mixed.kt | 0 .../{ast => fileOrElement}/issues/kt-543.java | 0 .../{ast => fileOrElement}/issues/kt-543.kt | 0 .../{ast => fileOrElement}/issues/kt-638.java | 0 .../{ast => fileOrElement}/issues/kt-638.kt | 0 .../{ast => fileOrElement}/issues/kt-696.java | 0 .../{ast => fileOrElement}/issues/kt-696.kt | 0 .../issues/kt-792-mixed.java | 0 .../issues/kt-792-mixed.kt | 0 .../{ast => fileOrElement}/issues/kt-792.java | 0 .../{ast => fileOrElement}/issues/kt-792.kt | 0 .../issues/kt-794-mixed.java | 0 .../issues/kt-794-mixed.kt | 0 .../{ast => fileOrElement}/issues/kt-794.java | 0 .../{ast => fileOrElement}/issues/kt-794.kt | 0 .../{ast => fileOrElement}/issues/kt-807.java | 0 .../{ast => fileOrElement}/issues/kt-807.kt | 0 .../issues/kt-809-string.java | 0 .../issues/kt-809-string.kt | 0 .../{ast => fileOrElement}/issues/kt-809.java | 0 .../{ast => fileOrElement}/issues/kt-809.kt | 0 .../issues/kt-820-field.java | 0 .../issues/kt-820-field.kt | 0 .../issues/kt-820-string.java | 0 .../issues/kt-820-string.kt | 0 .../{ast => fileOrElement}/issues/kt-820.java | 0 .../{ast => fileOrElement}/issues/kt-820.kt | 0 .../issues/kt-824-isDir.java | 0 .../issues/kt-824-isDir.kt | 0 .../{ast => fileOrElement}/issues/kt-824.java | 0 .../{ast => fileOrElement}/issues/kt-824.kt | 0 .../{ast => fileOrElement}/issues/kt-828.java | 0 .../{ast => fileOrElement}/issues/kt-828.kt | 0 .../{ast => fileOrElement}/issues/kt-836.java | 0 .../{ast => fileOrElement}/issues/kt-836.kt | 0 .../{ast => fileOrElement}/issues/kt-837.java | 0 .../{ast => fileOrElement}/issues/kt-837.kt | 0 .../{ast => fileOrElement}/issues/kt-851.java | 0 .../{ast => fileOrElement}/issues/kt-851.kt | 0 .../{ast => fileOrElement}/issues/kt-852.java | 0 .../{ast => fileOrElement}/issues/kt-852.kt | 0 .../{ast => fileOrElement}/issues/kt-871.java | 0 .../{ast => fileOrElement}/issues/kt-871.kt | 0 .../{ast => fileOrElement}/issues/kt-879.java | 0 .../{ast => fileOrElement}/issues/kt-879.kt | 0 .../{ast => fileOrElement}/issues/kt-893.java | 0 .../{ast => fileOrElement}/issues/kt-893.kt | 0 .../{ast => fileOrElement}/issues/kt-899.java | 0 .../{ast => fileOrElement}/issues/kt-899.kt | 0 .../{ast => fileOrElement}/issues/kt-963.java | 0 .../{ast => fileOrElement}/issues/kt-963.kt | 0 .../issues/qualifyStatic.java | 0 .../issues/qualifyStatic.kt | 0 .../issues/spaceBeforeAssignment.java | 0 .../issues/spaceBeforeAssignment.kt | 0 .../kotlinApiAccess/ClassObjectMembers.java | 0 .../kotlinApiAccess/ClassObjectMembers.kt | 0 .../CorrectFunNullabilityDetected.java | 0 .../CorrectFunNullabilityDetected.kt | 0 .../CorrectNullabilityDetected.java | 0 .../CorrectNullabilityDetected.kt | 0 .../kotlinApiAccess/ExtensionFunction.java | 0 .../kotlinApiAccess/ExtensionFunction.kt | 0 .../kotlinApiAccess/ExtensionProperty.java | 0 .../kotlinApiAccess/ExtensionProperty.kt | 0 .../kotlinApiAccess/GlobalFunction.java | 0 .../kotlinApiAccess/GlobalFunction.kt | 0 .../GlobalGenericFunction.java | 0 .../kotlinApiAccess/GlobalGenericFunction.kt | 0 .../kotlinApiAccess/GlobalValue1.java | 0 .../kotlinApiAccess/GlobalValue1.kt | 0 .../kotlinApiAccess/GlobalValue2.java | 0 .../kotlinApiAccess/GlobalValue2.kt | 0 .../kotlinApiAccess/InheritedProperty.java | 0 .../kotlinApiAccess/InheritedProperty.kt | 0 .../kotlinApiAccess/ObjectMembers.java | 0 .../kotlinApiAccess/ObjectMembers.kt | 0 .../kotlinApiAccess/Property.java | 0 .../kotlinApiAccess/Property.kt | 0 .../kotlinApiAccess/Property2.java | 0 .../kotlinApiAccess/Property2.kt | 0 .../complicatedExampleFromJavaTutorial.java | 0 .../complicatedExampleFromJavaTutorial.kt | 0 .../{ast => fileOrElement}/list/ForEach.java | 0 .../{ast => fileOrElement}/list/ForEach.kt | 0 .../{ast => fileOrElement}/list/Lists.java | 0 .../{ast => fileOrElement}/list/Lists.kt | 0 .../literalExpression/char.java | 0 .../literalExpression/char.kt | 0 .../literalExpression/dollarInsideString.java | 0 .../literalExpression/dollarInsideString.kt | 0 .../literalExpression/endsWithDFL.java | 0 .../literalExpression/endsWithDFL.kt | 0 .../literalExpression/hex.java | 0 .../literalExpression/hex.kt | 0 .../literalExpression/octal.java | 0 .../literalExpression/octal.kt | 0 .../literalExpression/trueOrFalse.java | 0 .../literalExpression/trueOrFalse.kt | 0 .../localVariable/autoBangBang.java | 0 .../localVariable/autoBangBang.kt | 0 .../localVariable/conversion.java | 0 .../localVariable/conversion.kt | 0 .../localVariable/literalConversion.java | 0 .../localVariable/literalConversion.kt | 0 .../localVariable/nullIInitializer.java | 0 .../localVariable/nullIInitializer.kt | 0 .../localVariable/object.java | 0 .../localVariable/object.kt | 0 .../localVariable/unboxing.java | 0 .../localVariable/unboxing.kt | 0 .../localVariable/valTypeDoNotMatch.java | 0 .../localVariable/valTypeDoNotMatch.kt | 0 .../localVariable/varTypeDoNotMatch.java | 0 .../localVariable/varTypeDoNotMatch.kt | 0 .../localVariable/varWithNoInitializer.java | 0 .../localVariable/varWithNoInitializer.kt | 0 .../callWithKeywords.java | 0 .../methodCallExpression/callWithKeywords.kt | 0 .../collectionsMethods.java | 0 .../collectionsMethods.kt | 0 .../collectionsMethods.kt.todo | 0 .../collectionsMethods2.java | 0 .../collectionsMethods2.kt | 0 .../methodCallExpression/emptyCall.java | 0 .../methodCallExpression/emptyCall.kt | 0 .../methodCallExpression/genericMethod.java | 0 .../methodCallExpression/genericMethod.kt | 0 .../methodCallExpression/getClass.java | 0 .../methodCallExpression/getClass.kt | 0 .../methodCallExpression/simpleCall.java | 0 .../methodCallExpression/simpleCall.kt | 0 .../methodCallExpression/vararg1.java | 0 .../methodCallExpression/vararg1.kt | 0 .../methodCallExpression/vararg2.java | 0 .../methodCallExpression/vararg2.kt | 0 .../misc/packageWithClass.java | 0 .../misc/packageWithClass.kt | 0 .../misc/packageWithClasses.java | 0 .../misc/packageWithClasses.kt | 0 .../misc/packageWithImports.java | 0 .../misc/packageWithImports.kt | 0 .../misc/packageWithMixedImports.java | 0 .../misc/packageWithMixedImports.kt | 0 .../misc/packageWithOpenClass.java | 0 .../misc/packageWithOpenClass.kt | 0 .../misc/packageWithStaticImports.java | 0 .../misc/packageWithStaticImports.kt | 0 .../newClassExpression/classWithParam.java | 0 .../newClassExpression/classWithParam.kt | 0 .../newClassExpression/classWithParams.java | 0 .../newClassExpression/classWithParams.kt | 0 .../newClassExpression/classWithoutBody.java | 0 .../newClassExpression/classWithoutBody.kt | 0 .../newClassExpression/fullQualifiedName.java | 0 .../newClassExpression/fullQualifiedName.kt | 0 .../fullQualifiedName2.java | 0 .../newClassExpression/fullQualifiedName2.kt | 0 .../genericClassInvocation.java | 0 .../genericClassInvocation.kt | 0 .../newClassExpression/newAnonymousClass.java | 0 .../newClassExpression/newAnonymousClass.kt | 0 .../newAnonymousClass2.java | 0 .../newClassExpression/newAnonymousClass2.kt | 0 .../newAnonymousClass3.java | 0 .../newClassExpression/newAnonymousClass3.kt | 0 .../newClassByFullName.java | 0 .../newClassExpression/newClassByFullName.kt | 0 .../newClassExpression/newInnerClass.java | 0 .../newClassExpression/newInnerClass.kt | 0 .../newListAndNewMember.java | 0 .../newClassExpression/newListAndNewMember.kt | 0 .../newStaticInnerClass.java | 0 .../newClassExpression/newStaticInnerClass.kt | 0 .../nullability/FieldAssignedWithNull.java | 0 .../nullability/FieldAssignedWithNull.kt | 0 .../nullability/FieldComparedWithNull.java | 0 .../nullability/FieldComparedWithNull.kt | 0 .../nullability/FieldComparedWithNull2.java | 0 .../nullability/FieldComparedWithNull2.kt | 0 .../nullability/FieldComparedWithNull3.java | 0 .../nullability/FieldComparedWithNull3.kt | 0 .../nullability/FieldComparedWithNull4.java | 0 .../nullability/FieldComparedWithNull4.kt | 0 .../nullability/FieldInitializedWithNull.java | 0 .../nullability/FieldInitializedWithNull.kt | 0 .../nullability/IndirectOverride.java | 0 .../nullability/IndirectOverride.kt | 0 .../nullability/MethodInvokedWithNullArg.java | 0 .../nullability/MethodInvokedWithNullArg.kt | 0 .../MethodInvokedWithNullArg2.java | 0 .../nullability/MethodInvokedWithNullArg2.kt | 0 .../MethodInvokedWithTernaryNullArg.java | 0 .../MethodInvokedWithTernaryNullArg.kt | 0 .../MethodResultComparedWithNull.java | 0 .../MethodResultComparedWithNull.kt | 0 .../MethodResultComparedWithNull2.java | 0 .../MethodResultComparedWithNull2.kt | 0 .../MethodResultComparedWithNull3.java | 0 .../MethodResultComparedWithNull3.kt | 0 .../MethodResultComparedWithNull4.java | 0 .../MethodResultComparedWithNull4.kt | 0 .../MethodResultInitializesNullableField.java | 0 .../MethodResultInitializesNullableField.kt | 0 .../nullability/MethodReturnsNull.java | 0 .../nullability/MethodReturnsNull.kt | 0 .../MethodReturnsNullInAnonymousClass.java | 0 .../MethodReturnsNullInAnonymousClass.kt | 0 .../MethodReturnsNullInLocalClass.java | 0 .../MethodReturnsNullInLocalClass.kt | 0 .../nullability/MethodReturnsTernaryNull.java | 0 .../nullability/MethodReturnsTernaryNull.kt | 0 .../nullability/NullableIntNoCrash.java | 0 .../nullability/NullableIntNoCrash.kt | 0 .../nullability/NullableMethodDotAccess.java | 0 .../nullability/NullableMethodDotAccess.kt | 0 .../NullableVariableDotAccess.java | 0 .../nullability/NullableVariableDotAccess.kt | 0 .../OverrideWithInheritanceLoop.java | 0 .../OverrideWithInheritanceLoop.kt | 0 .../nullability/Overrides.java | 0 .../nullability/Overrides.kt | 0 .../ParameterComparedWithNull.java | 0 .../nullability/ParameterComparedWithNull.kt | 0 .../nullability/VariableAssignedWithNull.java | 0 .../nullability/VariableAssignedWithNull.kt | 0 .../nullability/VariableComparedWithNull.java | 0 .../nullability/VariableComparedWithNull.kt | 0 .../VariableInitializedWithNull.java | 0 .../VariableInitializedWithNull.kt | 0 .../VariableInitializedWithTernaryNull.java | 0 .../VariableInitializedWithTernaryNull.kt | 0 .../nullability/autoNotNull.java | 0 .../nullability/autoNotNull.kt | 0 .../objectLiteral/MyFrame.java | 0 .../objectLiteral/MyFrame.kt | 0 .../outProjectionType/methodParams.java | 0 .../outProjectionType/methodParams.kt | 0 .../orgJetbrainsJetJ2kIn.java | 0 .../packageStatement/orgJetbrainsJetJ2kIn.kt | 0 .../parenthesized.java | 0 .../parenthesizedExpression/parenthesized.kt | 0 .../parenthesized2.java | 0 .../parenthesizedExpression/parenthesized2.kt | 0 .../polyadicExpression/divide.java | 0 .../polyadicExpression/divide.kt | 0 .../polyadicExpression/minus.java | 0 .../polyadicExpression/minus.kt | 0 .../polyadicExpression/multiply.java | 0 .../polyadicExpression/multiply.kt | 0 .../polyadicExpression/plus.java | 0 .../polyadicExpression/plus.kt | 0 .../polyadicExpression/remainder.java | 0 .../polyadicExpression/remainder.kt | 0 .../unassignedShiftRight.java | 0 .../unassignedShiftRight.kt | 0 .../postfixOperator/decrement.java | 0 .../postfixOperator/decrement.kt | 0 .../postfixOperator/increment.java | 0 .../postfixOperator/increment.kt | 0 .../prefixOperator/decrement.java | 0 .../prefixOperator/decrement.kt | 0 .../prefixOperator/excl.java | 0 .../prefixOperator/excl.kt | 0 .../prefixOperator/increment.java | 0 .../prefixOperator/increment.kt | 0 .../prefixOperator/kt-667.java | 0 .../prefixOperator/kt-667.kt | 0 .../prefixOperator/nullableIf.java | 0 .../prefixOperator/nullableIf.kt | 0 .../prefixOperator/tilde.java | 0 .../prefixOperator/tilde.kt | 0 .../rawGenerics/kt-540-map.java | 0 .../rawGenerics/kt-540-map.kt | 0 .../rawGenerics/kt-540-rawGenericClass.java | 0 .../rawGenerics/kt-540-rawGenericClass.kt | 0 .../rawGenerics/kt-540.java | 0 .../rawGenerics/kt-540.kt | 0 .../rawGenerics/rawGenericMethod.java | 0 .../rawGenerics/rawGenericMethod.kt | 0 .../returnStatement/currentMethodBug.java | 0 .../returnStatement/currentMethodBug.kt | 0 .../returnStatement/returnChar.java | 0 .../returnStatement/returnChar.kt | 0 .../returnStatement/returnLiteral.java | 0 .../returnStatement/returnLiteral.kt | 0 .../returnStatement/returnNumber.java | 0 .../returnStatement/returnNumber.kt | 0 .../returnStatement/returnString.java | 0 .../returnStatement/returnString.kt | 0 .../settings/openByDefault.java | 0 .../settings/openByDefault.kt | 0 .../settings/specifyFieldTypeByDefault.java | 0 .../settings/specifyFieldTypeByDefault.kt | 0 .../specifyLocalVariableTypeByDefault.java | 0 .../specifyLocalVariableTypeByDefault.kt | 0 ...pecifyLocalVariableTypeByDefaultInFor.java | 0 .../specifyLocalVariableTypeByDefaultInFor.kt | 0 .../starProjectionType/methodParams.java | 0 .../starProjectionType/methodParams.kt | 0 .../staticMembers/PrivateStaticMembers.java | 0 .../staticMembers/PrivateStaticMembers.kt | 0 .../staticMembers/PrivateStaticMethods1.java | 0 .../staticMembers/PrivateStaticMethods1.kt | 0 .../staticMembers/PrivateStaticMethods2.java | 0 .../staticMembers/PrivateStaticMethods2.kt | 0 .../staticMembers/PrivateStaticMethods3.java | 0 .../staticMembers/PrivateStaticMethods3.kt | 0 .../staticMembers/PrivateStaticMethods4.java | 0 .../staticMembers/PrivateStaticMethods4.kt | 0 .../superExpression/classAdotSuperFoo.java | 0 .../superExpression/classAdotSuperFoo.kt | 0 .../superExpression/classAextendsB.java | 0 .../superExpression/classAextendsB.kt | 0 .../superExpression/superStatement.java | 0 .../superExpression/superStatement.kt | 0 .../switch/caseWithBlock.java | 0 .../switch/caseWithBlock.kt | 0 .../switch/comlicatedFallDown.java | 0 .../switch/comlicatedFallDown.kt | 0 .../switch/continueAndBreakWithLabel.java | 0 .../switch/continueAndBreakWithLabel.kt | 0 .../switch/emptySwitch.java | 0 .../switch/emptySwitch.kt | 0 .../switch/enumConstants.java | 0 .../switch/enumConstants.kt | 0 .../switch/fallDown.java | 0 .../{ast => fileOrElement}/switch/fallDown.kt | 0 .../switch/fallDownWithBlocks.java | 0 .../switch/fallDownWithBlocks.kt | 0 .../switch/invalidSwitch.java | 0 .../switch/invalidSwitch.kt | 0 .../{ast => fileOrElement}/switch/kt-539.java | 0 .../{ast => fileOrElement}/switch/kt-539.kt | 0 .../switch/nondefault.java | 0 .../switch/nondefault.kt | 0 .../switch/returnsAndThrows.java | 0 .../switch/returnsAndThrows.kt | 0 .../singleLineExample.java | 0 .../singleLineExample.kt | 0 .../thisExpression/classAdotThisFoo.java | 0 .../thisExpression/classAdotThisFoo.kt | 0 .../thisExpression/thisStatement.java | 0 .../thisExpression/thisStatement.kt | 0 .../throwStatement/simpleThrowStatement.java | 0 .../throwStatement/simpleThrowStatement.kt | 0 .../toKotlinClasses/TypeParameterBound.java | 0 .../toKotlinClasses/TypeParameterBound.kt | 0 .../toKotlinClasses/iterableAndIterator.java | 0 .../toKotlinClasses/iterableAndIterator.kt | 0 .../toKotlinClasses/iterableAndIterator2.java | 0 .../toKotlinClasses/iterableAndIterator2.kt | 0 .../toKotlinClasses/iterableAndIterator3.java | 0 .../toKotlinClasses/iterableAndIterator3.kt | 0 .../trait/abstactInterface.java | 0 .../trait/abstactInterface.kt | 0 .../trait/emptyInterface.java | 0 .../trait/emptyInterface.kt | 0 ...neClassAndImplementsSeveralInterfaces.java | 0 ...sOneClassAndImplementsSeveralInterfaces.kt | 0 .../trait/extendsOneInterface.java | 0 .../trait/extendsOneInterface.kt | 0 .../trait/interfaceWithFields.java | 0 .../trait/interfaceWithFields.kt | 0 .../trait/interfaceWithMethodDeclaration.java | 0 .../trait/interfaceWithMethodDeclaration.kt | 0 .../trait/interfaceWithStaticFields.java | 0 .../trait/interfaceWithStaticFields.kt | 0 .../trait/internalInterface.java | 0 .../trait/internalInterface.kt | 0 .../trait/privateInterface.java | 0 .../trait/privateInterface.kt | 0 .../trait/protectedInterface.java | 0 .../trait/protectedInterface.kt | 0 .../trait/publicInterface.java | 0 .../trait/publicInterface.kt | 0 .../commonCaseForTryStatement.java | 0 .../tryStatement/commonCaseForTryStatement.kt | 0 .../tryStatement/disjunctionType.java | 0 .../tryStatement/disjunctionType.kt | 0 ...mptyTryWithTwoCatchesWithEmptyFinally.java | 0 .../emptyTryWithTwoCatchesWithEmptyFinally.kt | 0 .../emptyTryWithTwoCatchesWithFinally.java | 0 .../emptyTryWithTwoCatchesWithFinally.kt | 0 .../emptyTryWithTwoCatchesWithoutFinally.java | 0 .../emptyTryWithTwoCatchesWithoutFinally.kt | 0 .../tryWithResource/Multiline.java | 0 .../tryWithResource/Multiline.kt | 0 .../tryWithResource/MultipleResources.java | 0 .../tryWithResource/MultipleResources.kt | 0 .../tryWithResource/Simple.java | 0 .../tryWithResource/Simple.kt | 0 .../tryWithResource/WithCatch.java | 0 .../tryWithResource/WithCatch.kt | 0 .../tryWithResource/WithCatchAndFinally.java | 0 .../tryWithResource/WithCatchAndFinally.kt | 0 .../tryWithResource/WithCatches.java | 0 .../tryWithResource/WithCatches.kt | 0 .../tryWithResource/WithFinally.java | 0 .../tryWithResource/WithFinally.kt | 0 .../tryWithResource/WithReturnAtEnd.java | 0 .../tryWithResource/WithReturnAtEnd.kt | 0 .../WithReturnInAnonymousClass.java | 0 .../WithReturnInAnonymousClass.kt | 0 .../WithReturnInAnonymousClass2.java | 0 .../WithReturnInAnonymousClass2.kt | 0 .../WithReturnInAnonymousClass3.java.todo | 0 .../extendsWildcardCast.java | 0 .../typeCastExpression/extendsWildcardCast.kt | 0 .../typeCastExpression/fooCast.java | 0 .../typeCastExpression/fooCast.kt | 0 .../typeCastExpression/intCast.java | 0 .../typeCastExpression/intCast.kt | 0 .../typeCastExpression/primitiveType.java | 0 .../typeCastExpression/primitiveType.kt | 0 .../typeCastExpression/simpleGenericCast.java | 0 .../typeCastExpression/simpleGenericCast.kt | 0 .../typeCastExpression/stringCast.java | 0 .../typeCastExpression/stringCast.kt | 0 .../typeCastExpression/superWildcardCast.java | 0 .../typeCastExpression/superWildcardCast.kt | 0 .../typeCastExpression/wildcardCast.java | 0 .../typeCastExpression/wildcardCast.kt | 0 ...metrizationWithTwoBoundsWithExtending.java | 0 ...rametrizationWithTwoBoundsWithExtending.kt | 0 .../classParametrizationWithTwoBounds.java | 0 .../classParametrizationWithTwoBounds.kt | 0 ...metrizationWithTwoBoundsWithExtending.java | 0 ...rametrizationWithTwoBoundsWithExtending.kt | 0 .../complexExampleWithClassExtending.java | 0 .../complexExampleWithClassExtending.kt | 0 ...plexExampleWithClassMultiplyExtending.java | 0 ...omplexExampleWithClassMultiplyExtending.kt | 0 .../typeParameters/genericClass.java | 0 .../typeParameters/genericClass.kt | 0 .../typeParameters/genericParam-settings.java | 0 .../typeParameters/genericParam-settings.kt | 0 .../typeParameters/genericParam.java | 0 .../typeParameters/genericParam.kt | 0 .../typeParameters/manyGenericParams.java | 0 .../typeParameters/manyGenericParams.kt | 0 ...hodDoubleParametrizationWithTwoBounds.java | 0 ...ethodDoubleParametrizationWithTwoBounds.kt | 0 .../typeParameters/needTypeArgs.java | 0 .../typeParameters/needTypeArgs.kt | 0 .../typeParameters/rawTypeCast.java | 0 .../typeParameters/rawTypeCast.kt | 0 ...metrizationWithTwoBoundsWithExtending.java | 0 ...rametrizationWithTwoBoundsWithExtending.kt | 0 .../typeParameters/typeFromOtherFile.java | 0 .../typeParameters/typeFromOtherFile.kt | 0 .../typeParameters/where.java | 0 .../typeParameters/where.kt | 0 .../varArg/ellipsisTypeSeveralParams.java | 0 .../varArg/ellipsisTypeSeveralParams.kt | 0 .../varArg/ellipsisTypeSingleParams.java | 0 .../varArg/ellipsisTypeSingleParams.kt | 0 .../whileStatement/whileWithBlock.java | 0 .../whileStatement/whileWithBlock.kt | 0 .../whileStatement/whileWithEmptyBlock.java | 0 .../whileStatement/whileWithEmptyBlock.kt | 0 .../whileStatement/whileWithExpression.java | 0 .../whileStatement/whileWithExpression.kt | 0 .../whileStatement/whileWithReturn.java | 0 .../whileStatement/whileWithReturn.kt | 0 .../multiFile/GetterAndSetterUsages/1.java | 19 + .../multiFile/GetterAndSetterUsages/1.kt | 11 + .../multiFile/GetterAndSetterUsages/2.java | 12 + .../multiFile/GetterAndSetterUsages/2.kt | 9 + 1111 files changed, 1904 insertions(+), 1625 deletions(-) create mode 100644 j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterMultiFileTest.kt create mode 100644 j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterSingleFileTest.kt create mode 100644 j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterMultiFileTestGenerated.java rename j2k/tests/test/org/jetbrains/jet/j2k/test/{JavaToKotlinConverterTestGenerated.java => JavaToKotlinConverterSingleFileTestGenerated.java} (71%) rename j2k/tests/testData/{ast => fileOrElement}/annotations/annotationInterface1.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/annotations/annotationInterface1.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/annotations/annotationInterface2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/annotations/annotationInterface2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/annotations/annotationInterface3.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/annotations/annotationInterface3.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/annotations/annotationUsages.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/annotations/annotationUsages.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/annotations/jetbrainsNotNull.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/annotations/jetbrainsNotNull.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/annotations/jetbrainsNotNullChainExpr.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/annotations/jetbrainsNotNullChainExpr.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/annotations/jetbrainsNullable.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/annotations/jetbrainsNullable.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/anonymousBlock/oneAnonBlock.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/anonymousBlock/oneAnonBlock.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/anonymousBlock/oneStaticAnonBlock.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/anonymousBlock/oneStaticAnonBlock.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayAccessExpression/expressionIndex.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayAccessExpression/expressionIndex.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayAccessExpression/intIndex.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayAccessExpression/intIndex.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayAccessExpression/variableIndex.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayAccessExpression/variableIndex.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/doubleArray.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/doubleArray.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/doubleArrayWithVariables.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/doubleArrayWithVariables.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/floatArray.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/floatArray.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/intArrayWithLength.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/intArrayWithLength.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/javaLangDoubleArray.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/javaLangDoubleArray.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/javaLangFloatArray.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/javaLangFloatArray.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/newByte.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/newByte.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/newInt.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/newInt.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/objectArrayWithLength.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/objectArrayWithLength.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/oneDim.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/oneDim.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/oneDimWithVariables.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/oneDimWithVariables.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/twoDim.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayInitializerExpression/twoDim.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayType/arrayInitializationStatement.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayType/arrayInitializationStatement.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayType/arrayInitializationStatementWithDimension.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayType/arrayInitializationStatementWithDimension.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayType/arrayInitializationStatementWithDimension3d.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayType/arrayInitializationStatementWithDimension3d.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayType/arrayInitializationStatementWithDimensionExplicit.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayType/arrayInitializationStatementWithDimensionExplicit.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayType/d2StringEmptyArray.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayType/d2StringEmptyArray.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayType/d3StringEmptyArray.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayType/d3StringEmptyArray.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayType/longArray.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayType/longArray.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayType/methodArrayArgs.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayType/methodArrayArgs.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayType/newIntArray.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayType/newIntArray.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayType/newStringArray.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/arrayType/newStringArray.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/assertStatement/onlyCondition.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/assertStatement/onlyCondition.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/assertStatement/onlyConditionWithBraces.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/assertStatement/onlyConditionWithBraces.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/assertStatement/withStringDetail.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/assertStatement/withStringDetail.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/assertStatement/withStringDetail2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/assertStatement/withStringDetail2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/and.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/and.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/assignment.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/assignment.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/divideAssign.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/divideAssign.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/minusAssign.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/minusAssign.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/multiplyAssign.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/multiplyAssign.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/nullability-settings.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/nullability-settings.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/nullability.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/nullability.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/or.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/or.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/plusAssign.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/plusAssign.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/reminder.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/reminder.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/shiftLeft.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/shiftLeft.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/shiftRight.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/shiftRight.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/simpleAssignment.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/simpleAssignment.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/unsignedRightShift.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/unsignedRightShift.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/xor.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/assignmentExpression/xor.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/and.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/and.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/conditionalAnd.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/conditionalAnd.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/conditionalOr.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/conditionalOr.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/divide.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/divide.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/greaterThan.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/greaterThan.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/greaterThanEqual.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/greaterThanEqual.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/lessThan.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/lessThan.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/lessThanEqual.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/lessThanEqual.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/minus.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/minus.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/multiplePlusMinus.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/multiplePlusMinus.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/multiply.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/multiply.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/or.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/or.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/plus.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/plus.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/remainder.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/remainder.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/shiftLeft.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/shiftLeft.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/shiftRight.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/shiftRight.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/unsignedRightShift.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/unsignedRightShift.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/xor.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/binaryExpression/xor.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/blocks/Blocks.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/blocks/Blocks.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/boxedType/Boxing.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/boxedType/Boxing.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/boxedType/boolean.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/boxedType/boolean.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/boxedType/byte.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/boxedType/byte.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/boxedType/character.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/boxedType/character.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/boxedType/double.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/boxedType/double.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/boxedType/float.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/boxedType/float.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/boxedType/integer.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/boxedType/integer.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/boxedType/kt-671.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/boxedType/kt-671.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/boxedType/long.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/boxedType/long.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/boxedType/object.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/boxedType/object.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/boxedType/short.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/boxedType/short.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/breakStatement/breakWithLabel.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/breakStatement/breakWithLabel.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/breakStatement/breakWithoutLabel.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/breakStatement/breakWithoutLabel.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/callChainExpression/libraryFieldCall.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/callChainExpression/libraryFieldCall.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/callChainExpression/libraryMethodCall.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/callChainExpression/libraryMethodCall.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/callChainExpression/libraryMethodCallFromInstance-settings.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/callChainExpression/libraryMethodCallFromInstance-settings.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/callChainExpression/libraryMethodCallFromInstance.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/callChainExpression/libraryMethodCallFromInstance.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/callChainExpression/libraryStringFieldCall.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/callChainExpression/libraryStringFieldCall.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/callChainExpression/sout.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/callChainExpression/sout.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/ClassShadowing.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/ClassShadowing.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/abstractClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/abstractClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/abstractClassShape.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/abstractClassShape.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/class.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/class.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/classWithEmptyMethods.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/classWithEmptyMethods.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/classWithFields.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/classWithFields.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/classWithMultiplyFields.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/classWithMultiplyFields.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/emptyClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/emptyClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/extendsOneClassAndImplementsOneInterface.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/extendsOneClassAndImplementsOneInterface.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/extendsOneClassAndImplementsSeveralInterfaces.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/extendsOneClassAndImplementsSeveralInterfaces.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/finalClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/finalClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/genericClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/genericClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/innerClassInInterface.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/innerClassInInterface.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/innerEmptyClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/innerEmptyClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/innerEnum.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/innerEnum.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/innerInterface.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/innerInterface.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/innerStaticClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/innerStaticClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/internalClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/internalClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/kt-639.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/kt-639.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/oneStaticFieldOneNonStatic.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/oneStaticFieldOneNonStatic.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/oneStaticMethod.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/oneStaticMethod.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/oneStaticMethodOneNonStatic.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/oneStaticMethodOneNonStatic.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/pivateClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/pivateClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/privateInit.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/privateInit.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/protectedClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/protectedClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/publicClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/publicClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/simpleInheritance.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/simpleInheritance.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/twoStaticMethod.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/class/twoStaticMethod.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/classExpression/complexExample.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/classExpression/complexExample.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/classExpression/objectClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/classExpression/objectClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/classExpression/primitivesAndArrays.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/classExpression/primitivesAndArrays.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/classExpression/stringClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/classExpression/stringClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/comments/comments.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/comments/comments.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/comments/comments.kt.todo (100%) rename j2k/tests/testData/{ast => fileOrElement}/comments/comments2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/comments/comments2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/comments/commentsForConstructors.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/comments/commentsForConstructors.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/comments/fieldWithEndOfLineComment.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/comments/fieldWithEndOfLineComment.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/comments/fieldsInitializedFromParams.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/comments/fieldsInitializedFromParams.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/conditionalExpression/multiline.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/conditionalExpression/multiline.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/conditionalExpression/simple.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/conditionalExpression/simple.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/allCallsPrimary.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/allCallsPrimary.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/allCallsPrimary2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/allCallsPrimary2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/artificialPrimary.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/artificialPrimary.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/chain.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/chain.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/constructorAnnotations.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/constructorAnnotations.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/customerBuilder.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/customerBuilder.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/fieldsInitializedFromParams1.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/fieldsInitializedFromParams1.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/fieldsInitializedFromParams2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/fieldsInitializedFromParams2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/fieldsInitializedFromParams3.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/fieldsInitializedFromParams3.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/fieldsInitializedFromParams4.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/fieldsInitializedFromParams4.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/fieldsInitializedFromParams5.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/fieldsInitializedFromParams5.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/fieldsInitializedFromParams6.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/fieldsInitializedFromParams6.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/fieldsInitializedFromParams7.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/fieldsInitializedFromParams7.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/fieldsInitializedFromParams8.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/fieldsInitializedFromParams8.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/fieldsInitializedFromParams9.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/fieldsInitializedFromParams9.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/genericIdentifier.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/genericIdentifier.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/identifier.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/identifier.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/methodCallInFactoryFun.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/methodCallInFactoryFun.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/nestedClassNameInParameterDefaults.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/nestedClassNameInParameterDefaults.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/nestedClassNameInParameterDefaults2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/nestedClassNameInParameterDefaults2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/nestedClassNameInParameterDefaults3.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/nestedClassNameInParameterDefaults3.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/nestedClassNameInParameterDefaults4.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/nestedClassNameInParameterDefaults4.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/nestedClassNameInSuperParameters.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/nestedClassNameInSuperParameters.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/noPrimary.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/noPrimary.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/parameterDefaults1.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/parameterDefaults1.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/parameterDefaults2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/parameterDefaults2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/parameterDefaults3.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/parameterDefaults3.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/parameterDefaults4.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/parameterDefaults4.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/parameterDefaults5.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/parameterDefaults5.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/parameterModification.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/parameterModification.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/privateConstructors.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/privateConstructors.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/qualifiedRefInFactoryFun.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/qualifiedRefInFactoryFun.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/secondaryConstructorsInInnerClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/secondaryConstructorsInInnerClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/secondaryConstructorsInNestedClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/secondaryConstructorsInNestedClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/secondaryConstructorsVisibility.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/secondaryConstructorsVisibility.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/staticFieldRefInFactoryFun.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/staticFieldRefInFactoryFun.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/withManyDefaultParams.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/constructors/withManyDefaultParams.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/continueStatement/continueWithLabel.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/continueStatement/continueWithLabel.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/continueStatement/continueWithoutLabel.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/continueStatement/continueWithoutLabel.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/declarationStatement/multiplyFinalIntDeclaration.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/declarationStatement/multiplyFinalIntDeclaration.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/declarationStatement/multiplyIntDeclaration.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/declarationStatement/multiplyIntDeclaration.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/declarationStatement/singleFinalIntDeclaration.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/declarationStatement/singleFinalIntDeclaration.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/declarationStatement/singleFinalStringDeclaration.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/declarationStatement/singleFinalStringDeclaration.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/declarationStatement/singleIntDeclaration.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/declarationStatement/singleIntDeclaration.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/declarationStatement/singleStringDeclaration.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/declarationStatement/singleStringDeclaration.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/doWhileStatement/whileWithBlock.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/doWhileStatement/whileWithBlock.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/doWhileStatement/whileWithEmptyBlock.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/doWhileStatement/whileWithEmptyBlock.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/doWhileStatement/whileWithExpression.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/doWhileStatement/whileWithExpression.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/doWhileStatement/whileWithReturn.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/doWhileStatement/whileWithReturn.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/AccessInGetterWithThis.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/AccessInGetterWithThis.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/CannotDropOnlySetter.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/CannotDropOnlySetter.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/DataClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/DataClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/DataClassWithMutableField.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/DataClassWithMutableField.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/DifferentFieldName.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/DifferentFieldName.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/DifferentFieldNameAndDefaultParameterValue.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/DifferentFieldNameAndDefaultParameterValue.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/DifferentFieldNameAndSuperClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/DifferentFieldNameAndSuperClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/DifferentProtectedFieldName.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/DifferentProtectedFieldName.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/DropGetter.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/DropGetter.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/DropGetterAndSetter.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/DropGetterAndSetter.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/DropGetterForMutable.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/DropGetterForMutable.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/FalseGetter.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/FalseGetter.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/FalseSetter.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/FalseSetter.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/FieldUsagesInFactoryMethods.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/FieldUsagesInFactoryMethods.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/GetterAndSetterNamesDifferent.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/GetterAndSetterNamesDifferent.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/GetterSetterUsages.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/GetterSetterUsages.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/dropAccessors/QualifyFieldUsagesOnRename.java.todo (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/colorEnum.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/colorEnum.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/emptyEnum.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/emptyEnum.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/enumConstantIsNotNull.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/enumConstantIsNotNull.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/enumImplementsOneInterface.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/enumImplementsOneInterface.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/enumImplementsSeveralInterfaces.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/enumImplementsSeveralInterfaces.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/enumWithNameField.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/enumWithNameField.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/fieldsWithPrimaryPrivateConstructor.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/fieldsWithPrimaryPrivateConstructor.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/internalEnum.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/internalEnum.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/overrideToString.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/overrideToString.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/primaryPrivateConstructor.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/primaryPrivateConstructor.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/privateEnum.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/privateEnum.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/protectedEnum.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/protectedEnum.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/publicEnum.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/publicEnum.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/runnableImplementation.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/runnableImplementation.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/typeSafeEnum.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/enum/typeSafeEnum.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/equals/Equals1.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/equals/Equals1.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/equals/Equals2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/equals/Equals2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/equals/Equals3.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/equals/Equals3.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/equals/Equals4.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/equals/Equals4.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/equals/ObjectsEquals.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/equals/ObjectsEquals.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/classChildExtendsBase.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/classChildExtendsBase.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/conversion.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/conversion.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/internalField.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/internalField.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/privateField.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/privateField.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/protectedField.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/protectedField.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/publicField.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/publicField.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/specifyType.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/specifyType.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/valOrVar.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/valOrVar.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/valWithInit.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/valWithInit.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/varWithInit.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/varWithInit.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/varWithoutInit.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/varWithoutInit.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/volatileTransientAndStrictFp.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/field/volatileTransientAndStrictFp.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/commonCaseForTest.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/commonCaseForTest.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/falseForRange.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/falseForRange.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forRangeWithBlock.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forRangeWithBlock.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forRangeWithLE.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forRangeWithLE.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forRangeWithLT.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forRangeWithLT.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forThroughArrayIndices.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forThroughArrayIndices.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forThroughListIndices.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forThroughListIndices.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forThroughNonArrayIndices.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forThroughNonArrayIndices.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forThroughNonCollectionIndices.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forThroughNonCollectionIndices.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forWithBlock.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forWithBlock.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forWithBlockAndDoubleUpdate.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forWithBlockAndDoubleUpdate.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forWithEmptyBlock.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forWithEmptyBlock.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forWithExpression.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forWithExpression.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forWithNullCondition.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forWithNullCondition.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forWithNullInit.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forWithNullInit.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forWithNullUpdate.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forWithNullUpdate.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forWithReturn.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/forWithReturn.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/infiniteFor.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/for/infiniteFor.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/foreachStatement/enhancedForWithBlock.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/foreachStatement/enhancedForWithBlock.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/foreachStatement/enhancedForWithEmptyBlock.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/foreachStatement/enhancedForWithEmptyBlock.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/foreachStatement/enhancedForWithExpression.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/foreachStatement/enhancedForWithExpression.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/foreachStatement/enhancedForWithReturn.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/foreachStatement/enhancedForWithReturn.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/foreachStatement/nullableIterable.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/foreachStatement/nullableIterable.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/formatting/nonStaticMembers.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/formatting/nonStaticMembers.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/formatting/nonStaticMembersWithComments.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/formatting/nonStaticMembersWithComments.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/formatting/staticAndNonStaticMembersWithComments.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/formatting/staticAndNonStaticMembersWithComments.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/formatting/staticMembersWithComments.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/formatting/staticMembersWithComments.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/abstractMethod.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/abstractMethod.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/classGenericParam.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/classGenericParam.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/emptyVoidMethod.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/emptyVoidMethod.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/extendsBaseWhichExtendsObject.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/extendsBaseWhichExtendsObject.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/final.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/final.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/functionInFinalClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/functionInFinalClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/internal.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/internal.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/main.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/main.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/main2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/main2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/mainAndNullabilitySetting.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/mainAndNullabilitySetting.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/methodClassType.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/methodClassType.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/methodPrimitiveType.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/methodPrimitiveType.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/methodPrimitiveType2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/methodPrimitiveType2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/methodWithReturnStatement.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/methodWithReturnStatement.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/open.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/open.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/override.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/override.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/overrideAndOpen.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/overrideAndOpen.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/overrideObject.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/overrideObject.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/overrideObject2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/overrideObject2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/overrideObject3.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/overrideObject3.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/ownGenericParam.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/ownGenericParam.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/ownSeveralGenericParams.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/ownSeveralGenericParams.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/parameterModification.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/parameterModification.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/private.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/private.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/protected.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/protected.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/public.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/public.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/synchronizedMethod.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/synchronizedMethod.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/throws.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/throws.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/varVararg.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/function/varVararg.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/identifier/finalFieldReference.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/identifier/finalFieldReference.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/identifier/keywords.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/identifier/keywords.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/identifier/withDollar.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/identifier/withDollar.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/ifStatement/elseIf.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/ifStatement/elseIf.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/ifStatement/multiLine.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/ifStatement/multiLine.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/ifStatement/singleLine.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/ifStatement/singleLine.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/ifStatement/withBlocks.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/ifStatement/withBlocks.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/ifStatement/withEmptyBlocks.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/ifStatement/withEmptyBlocks.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/ifStatement/withoutElse.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/ifStatement/withoutElse.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/importStatement/importWithKeywords.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/importStatement/importWithKeywords.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/importStatement/importWithStar.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/importStatement/importWithStar.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/importStatement/oneImport.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/importStatement/oneImport.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/importStatement/onlyImports.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/importStatement/onlyImports.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/importStatement/simpleImport.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/importStatement/simpleImport.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/inProjectionType/methodParams.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/inProjectionType/methodParams.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/inheritance/classOneExtendsBaseGeneric.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/inheritance/classOneExtendsBaseGeneric.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/inheritance/classOneExtendsBaseWithOneParam.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/inheritance/classOneExtendsBaseWithOneParam.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/inheritance/classOneExtendsBaseWithZeroParams.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/inheritance/classOneExtendsBaseWithZeroParams.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/isOperator/complicatedExpression.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/isOperator/complicatedExpression.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/isOperator/simpleReference.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/isOperator/simpleReference.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/arrayLength.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/arrayLength.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/comments.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/comments.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/doNotQualifyStatic.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/doNotQualifyStatic.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-1016.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-1016.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-1048.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-1048.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-1074.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-1074.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-5294.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-5294.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-5400.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-5400.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-543-boxed.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-543-boxed.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-543-mixed.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-543-mixed.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-543.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-543.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-638.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-638.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-696.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-696.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-792-mixed.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-792-mixed.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-792.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-792.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-794-mixed.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-794-mixed.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-794.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-794.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-807.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-807.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-809-string.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-809-string.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-809.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-809.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-820-field.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-820-field.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-820-string.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-820-string.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-820.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-820.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-824-isDir.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-824-isDir.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-824.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-824.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-828.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-828.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-836.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-836.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-837.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-837.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-851.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-851.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-852.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-852.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-871.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-871.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-879.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-879.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-893.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-893.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-899.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-899.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-963.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/kt-963.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/qualifyStatic.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/qualifyStatic.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/spaceBeforeAssignment.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/issues/spaceBeforeAssignment.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/ClassObjectMembers.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/ClassObjectMembers.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/CorrectFunNullabilityDetected.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/CorrectFunNullabilityDetected.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/CorrectNullabilityDetected.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/CorrectNullabilityDetected.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/ExtensionFunction.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/ExtensionFunction.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/ExtensionProperty.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/ExtensionProperty.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/GlobalFunction.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/GlobalFunction.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/GlobalGenericFunction.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/GlobalGenericFunction.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/GlobalValue1.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/GlobalValue1.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/GlobalValue2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/GlobalValue2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/InheritedProperty.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/InheritedProperty.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/ObjectMembers.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/ObjectMembers.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/Property.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/Property.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/Property2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/kotlinApiAccess/Property2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/labelStatement/complicatedExampleFromJavaTutorial.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/labelStatement/complicatedExampleFromJavaTutorial.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/list/ForEach.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/list/ForEach.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/list/Lists.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/list/Lists.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/literalExpression/char.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/literalExpression/char.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/literalExpression/dollarInsideString.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/literalExpression/dollarInsideString.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/literalExpression/endsWithDFL.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/literalExpression/endsWithDFL.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/literalExpression/hex.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/literalExpression/hex.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/literalExpression/octal.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/literalExpression/octal.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/literalExpression/trueOrFalse.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/literalExpression/trueOrFalse.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/localVariable/autoBangBang.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/localVariable/autoBangBang.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/localVariable/conversion.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/localVariable/conversion.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/localVariable/literalConversion.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/localVariable/literalConversion.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/localVariable/nullIInitializer.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/localVariable/nullIInitializer.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/localVariable/object.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/localVariable/object.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/localVariable/unboxing.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/localVariable/unboxing.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/localVariable/valTypeDoNotMatch.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/localVariable/valTypeDoNotMatch.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/localVariable/varTypeDoNotMatch.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/localVariable/varTypeDoNotMatch.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/localVariable/varWithNoInitializer.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/localVariable/varWithNoInitializer.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/methodCallExpression/callWithKeywords.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/methodCallExpression/callWithKeywords.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/methodCallExpression/collectionsMethods.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/methodCallExpression/collectionsMethods.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/methodCallExpression/collectionsMethods.kt.todo (100%) rename j2k/tests/testData/{ast => fileOrElement}/methodCallExpression/collectionsMethods2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/methodCallExpression/collectionsMethods2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/methodCallExpression/emptyCall.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/methodCallExpression/emptyCall.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/methodCallExpression/genericMethod.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/methodCallExpression/genericMethod.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/methodCallExpression/getClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/methodCallExpression/getClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/methodCallExpression/simpleCall.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/methodCallExpression/simpleCall.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/methodCallExpression/vararg1.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/methodCallExpression/vararg1.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/methodCallExpression/vararg2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/methodCallExpression/vararg2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/misc/packageWithClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/misc/packageWithClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/misc/packageWithClasses.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/misc/packageWithClasses.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/misc/packageWithImports.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/misc/packageWithImports.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/misc/packageWithMixedImports.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/misc/packageWithMixedImports.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/misc/packageWithOpenClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/misc/packageWithOpenClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/misc/packageWithStaticImports.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/misc/packageWithStaticImports.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/classWithParam.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/classWithParam.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/classWithParams.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/classWithParams.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/classWithoutBody.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/classWithoutBody.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/fullQualifiedName.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/fullQualifiedName.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/fullQualifiedName2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/fullQualifiedName2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/genericClassInvocation.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/genericClassInvocation.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/newAnonymousClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/newAnonymousClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/newAnonymousClass2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/newAnonymousClass2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/newAnonymousClass3.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/newAnonymousClass3.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/newClassByFullName.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/newClassByFullName.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/newInnerClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/newInnerClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/newListAndNewMember.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/newListAndNewMember.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/newStaticInnerClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/newClassExpression/newStaticInnerClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/FieldAssignedWithNull.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/FieldAssignedWithNull.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/FieldComparedWithNull.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/FieldComparedWithNull.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/FieldComparedWithNull2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/FieldComparedWithNull2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/FieldComparedWithNull3.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/FieldComparedWithNull3.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/FieldComparedWithNull4.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/FieldComparedWithNull4.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/FieldInitializedWithNull.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/FieldInitializedWithNull.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/IndirectOverride.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/IndirectOverride.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodInvokedWithNullArg.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodInvokedWithNullArg.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodInvokedWithNullArg2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodInvokedWithNullArg2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodInvokedWithTernaryNullArg.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodInvokedWithTernaryNullArg.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodResultComparedWithNull.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodResultComparedWithNull.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodResultComparedWithNull2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodResultComparedWithNull2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodResultComparedWithNull3.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodResultComparedWithNull3.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodResultComparedWithNull4.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodResultComparedWithNull4.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodResultInitializesNullableField.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodResultInitializesNullableField.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodReturnsNull.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodReturnsNull.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodReturnsNullInAnonymousClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodReturnsNullInAnonymousClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodReturnsNullInLocalClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodReturnsNullInLocalClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodReturnsTernaryNull.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/MethodReturnsTernaryNull.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/NullableIntNoCrash.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/NullableIntNoCrash.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/NullableMethodDotAccess.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/NullableMethodDotAccess.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/NullableVariableDotAccess.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/NullableVariableDotAccess.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/OverrideWithInheritanceLoop.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/OverrideWithInheritanceLoop.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/Overrides.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/Overrides.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/ParameterComparedWithNull.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/ParameterComparedWithNull.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/VariableAssignedWithNull.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/VariableAssignedWithNull.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/VariableComparedWithNull.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/VariableComparedWithNull.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/VariableInitializedWithNull.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/VariableInitializedWithNull.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/VariableInitializedWithTernaryNull.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/VariableInitializedWithTernaryNull.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/autoNotNull.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/nullability/autoNotNull.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/objectLiteral/MyFrame.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/objectLiteral/MyFrame.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/outProjectionType/methodParams.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/outProjectionType/methodParams.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/packageStatement/orgJetbrainsJetJ2kIn.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/packageStatement/orgJetbrainsJetJ2kIn.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/parenthesizedExpression/parenthesized.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/parenthesizedExpression/parenthesized.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/parenthesizedExpression/parenthesized2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/parenthesizedExpression/parenthesized2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/polyadicExpression/divide.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/polyadicExpression/divide.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/polyadicExpression/minus.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/polyadicExpression/minus.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/polyadicExpression/multiply.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/polyadicExpression/multiply.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/polyadicExpression/plus.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/polyadicExpression/plus.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/polyadicExpression/remainder.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/polyadicExpression/remainder.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/polyadicExpression/unassignedShiftRight.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/polyadicExpression/unassignedShiftRight.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/postfixOperator/decrement.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/postfixOperator/decrement.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/postfixOperator/increment.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/postfixOperator/increment.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/prefixOperator/decrement.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/prefixOperator/decrement.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/prefixOperator/excl.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/prefixOperator/excl.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/prefixOperator/increment.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/prefixOperator/increment.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/prefixOperator/kt-667.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/prefixOperator/kt-667.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/prefixOperator/nullableIf.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/prefixOperator/nullableIf.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/prefixOperator/tilde.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/prefixOperator/tilde.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/rawGenerics/kt-540-map.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/rawGenerics/kt-540-map.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/rawGenerics/kt-540-rawGenericClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/rawGenerics/kt-540-rawGenericClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/rawGenerics/kt-540.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/rawGenerics/kt-540.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/rawGenerics/rawGenericMethod.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/rawGenerics/rawGenericMethod.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/returnStatement/currentMethodBug.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/returnStatement/currentMethodBug.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/returnStatement/returnChar.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/returnStatement/returnChar.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/returnStatement/returnLiteral.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/returnStatement/returnLiteral.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/returnStatement/returnNumber.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/returnStatement/returnNumber.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/returnStatement/returnString.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/returnStatement/returnString.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/settings/openByDefault.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/settings/openByDefault.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/settings/specifyFieldTypeByDefault.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/settings/specifyFieldTypeByDefault.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/settings/specifyLocalVariableTypeByDefault.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/settings/specifyLocalVariableTypeByDefault.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/settings/specifyLocalVariableTypeByDefaultInFor.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/settings/specifyLocalVariableTypeByDefaultInFor.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/starProjectionType/methodParams.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/starProjectionType/methodParams.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/staticMembers/PrivateStaticMembers.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/staticMembers/PrivateStaticMembers.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/staticMembers/PrivateStaticMethods1.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/staticMembers/PrivateStaticMethods1.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/staticMembers/PrivateStaticMethods2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/staticMembers/PrivateStaticMethods2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/staticMembers/PrivateStaticMethods3.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/staticMembers/PrivateStaticMethods3.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/staticMembers/PrivateStaticMethods4.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/staticMembers/PrivateStaticMethods4.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/superExpression/classAdotSuperFoo.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/superExpression/classAdotSuperFoo.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/superExpression/classAextendsB.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/superExpression/classAextendsB.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/superExpression/superStatement.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/superExpression/superStatement.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/switch/caseWithBlock.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/switch/caseWithBlock.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/switch/comlicatedFallDown.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/switch/comlicatedFallDown.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/switch/continueAndBreakWithLabel.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/switch/continueAndBreakWithLabel.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/switch/emptySwitch.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/switch/emptySwitch.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/switch/enumConstants.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/switch/enumConstants.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/switch/fallDown.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/switch/fallDown.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/switch/fallDownWithBlocks.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/switch/fallDownWithBlocks.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/switch/invalidSwitch.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/switch/invalidSwitch.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/switch/kt-539.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/switch/kt-539.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/switch/nondefault.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/switch/nondefault.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/switch/returnsAndThrows.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/switch/returnsAndThrows.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/synchronizedStatement/singleLineExample.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/synchronizedStatement/singleLineExample.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/thisExpression/classAdotThisFoo.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/thisExpression/classAdotThisFoo.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/thisExpression/thisStatement.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/thisExpression/thisStatement.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/throwStatement/simpleThrowStatement.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/throwStatement/simpleThrowStatement.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/toKotlinClasses/TypeParameterBound.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/toKotlinClasses/TypeParameterBound.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/toKotlinClasses/iterableAndIterator.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/toKotlinClasses/iterableAndIterator.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/toKotlinClasses/iterableAndIterator2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/toKotlinClasses/iterableAndIterator2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/toKotlinClasses/iterableAndIterator3.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/toKotlinClasses/iterableAndIterator3.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/trait/abstactInterface.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/trait/abstactInterface.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/trait/emptyInterface.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/trait/emptyInterface.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/trait/extendsOneClassAndImplementsSeveralInterfaces.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/trait/extendsOneClassAndImplementsSeveralInterfaces.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/trait/extendsOneInterface.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/trait/extendsOneInterface.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/trait/interfaceWithFields.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/trait/interfaceWithFields.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/trait/interfaceWithMethodDeclaration.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/trait/interfaceWithMethodDeclaration.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/trait/interfaceWithStaticFields.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/trait/interfaceWithStaticFields.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/trait/internalInterface.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/trait/internalInterface.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/trait/privateInterface.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/trait/privateInterface.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/trait/protectedInterface.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/trait/protectedInterface.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/trait/publicInterface.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/trait/publicInterface.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryStatement/commonCaseForTryStatement.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryStatement/commonCaseForTryStatement.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryStatement/disjunctionType.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryStatement/disjunctionType.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryStatement/emptyTryWithTwoCatchesWithFinally.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryStatement/emptyTryWithTwoCatchesWithFinally.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryStatement/emptyTryWithTwoCatchesWithoutFinally.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryStatement/emptyTryWithTwoCatchesWithoutFinally.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryWithResource/Multiline.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryWithResource/Multiline.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryWithResource/MultipleResources.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryWithResource/MultipleResources.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryWithResource/Simple.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryWithResource/Simple.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryWithResource/WithCatch.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryWithResource/WithCatch.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryWithResource/WithCatchAndFinally.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryWithResource/WithCatchAndFinally.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryWithResource/WithCatches.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryWithResource/WithCatches.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryWithResource/WithFinally.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryWithResource/WithFinally.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryWithResource/WithReturnAtEnd.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryWithResource/WithReturnAtEnd.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryWithResource/WithReturnInAnonymousClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryWithResource/WithReturnInAnonymousClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryWithResource/WithReturnInAnonymousClass2.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryWithResource/WithReturnInAnonymousClass2.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/tryWithResource/WithReturnInAnonymousClass3.java.todo (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeCastExpression/extendsWildcardCast.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeCastExpression/extendsWildcardCast.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeCastExpression/fooCast.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeCastExpression/fooCast.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeCastExpression/intCast.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeCastExpression/intCast.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeCastExpression/primitiveType.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeCastExpression/primitiveType.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeCastExpression/simpleGenericCast.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeCastExpression/simpleGenericCast.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeCastExpression/stringCast.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeCastExpression/stringCast.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeCastExpression/superWildcardCast.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeCastExpression/superWildcardCast.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeCastExpression/wildcardCast.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeCastExpression/wildcardCast.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/classParametrizationWithTwoBounds.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/classParametrizationWithTwoBounds.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/classParametrizationWithTwoBoundsWithExtending.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/complexExampleWithClassExtending.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/complexExampleWithClassExtending.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/complexExampleWithClassMultiplyExtending.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/complexExampleWithClassMultiplyExtending.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/genericClass.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/genericClass.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/genericParam-settings.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/genericParam-settings.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/genericParam.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/genericParam.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/manyGenericParams.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/manyGenericParams.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/methodDoubleParametrizationWithTwoBounds.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/methodDoubleParametrizationWithTwoBounds.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/needTypeArgs.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/needTypeArgs.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/rawTypeCast.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/rawTypeCast.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/typeFromOtherFile.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/typeFromOtherFile.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/where.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/typeParameters/where.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/varArg/ellipsisTypeSeveralParams.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/varArg/ellipsisTypeSeveralParams.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/varArg/ellipsisTypeSingleParams.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/varArg/ellipsisTypeSingleParams.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/whileStatement/whileWithBlock.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/whileStatement/whileWithBlock.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/whileStatement/whileWithEmptyBlock.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/whileStatement/whileWithEmptyBlock.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/whileStatement/whileWithExpression.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/whileStatement/whileWithExpression.kt (100%) rename j2k/tests/testData/{ast => fileOrElement}/whileStatement/whileWithReturn.java (100%) rename j2k/tests/testData/{ast => fileOrElement}/whileStatement/whileWithReturn.kt (100%) create mode 100644 j2k/tests/testData/multiFile/GetterAndSetterUsages/1.java create mode 100644 j2k/tests/testData/multiFile/GetterAndSetterUsages/1.kt create mode 100644 j2k/tests/testData/multiFile/GetterAndSetterUsages/2.java create mode 100644 j2k/tests/testData/multiFile/GetterAndSetterUsages/2.kt diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt index bb3d94dde6e..807334e96af 100644 --- a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt @@ -113,7 +113,7 @@ import org.jetbrains.jet.plugin.stubs.AbstractLazyResolveByStubTest import org.jetbrains.jet.plugin.stubs.AbstractMultiFileHighlightingTest import org.jetbrains.jet.cfg.AbstractPseudoValueTest import org.jetbrains.jet.plugin.structureView.AbstractKotlinFileStructureTest -import org.jetbrains.jet.j2k.test.AbstractJavaToKotlinConverterTest +import org.jetbrains.jet.j2k.test.AbstractJavaToKotlinConverterSingleFileTest import org.jetbrains.jet.jps.build.AbstractIncrementalJpsTest import org.jetbrains.jet.asJava.AbstractKotlinLightClassTest import org.jetbrains.jet.lang.resolve.java.AbstractJavaTypeSubstitutorTest @@ -127,6 +127,7 @@ import org.jetbrains.jet.generators.tests.reservedWords.generateTestDataForReser import org.jetbrains.k2js.test.semantics.AbstractReservedWordTest import org.jetbrains.jet.resolve.AbstractReferenceResolveInJavaTest import org.jetbrains.k2js.test.semantics.AbstractBridgeTest +import org.jetbrains.jet.j2k.test.AbstractJavaToKotlinConverterMultiFileTest import org.jetbrains.jet.j2k.test.AbstractJavaToKotlinConverterForWebDemoTest fun main(args: Array) { @@ -629,14 +630,18 @@ fun main(args: Array) { } testGroup("j2k/tests/test", "j2k/tests/testData") { - testClass(javaClass()) { - model("ast", extension = "java") + testClass(javaClass()) { + model("fileOrElement", extension = "java") } } - testGroup("j2k/tests/test", "j2k/tests/testData") { - testClass(javaClass()) { - model("ast", extension = "java") + testClass(javaClass()) { + model("multiFile", extension = null) + } + } + testGroup("j2k/tests/test", "j2k/tests/testData") { + testClass(javaClass()) { + model("fileOrElement", extension = "java") } } diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.java b/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.java index 04468a1a14a..a9f5552de7c 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.java @@ -25,8 +25,10 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiJavaFile; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.j2k.*; -import org.jetbrains.jet.plugin.j2k.J2kPostProcessor; +import org.jetbrains.jet.j2k.ConverterSettings; +import org.jetbrains.jet.j2k.FilesConversionScope; +import org.jetbrains.jet.j2k.IdeaReferenceSearcher; +import org.jetbrains.jet.j2k.JavaToKotlinConverter; import java.util.List; @@ -47,9 +49,7 @@ public class JavaToKotlinAction extends AnAction { final JavaToKotlinConverter converter = new JavaToKotlinConverter(project, ConverterSettings.defaultSettings, new FilesConversionScope(selectedJavaFiles), - IdeaReferenceSearcher.INSTANCE$, - //TODO: (module refactoring) resulting files should be analyzed in context of respective java files - new J2kPostProcessor(selectedJavaFiles.iterator().next())); + IdeaReferenceSearcher.INSTANCE$); CommandProcessor.getInstance().executeCommand( project, new Runnable() { diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinActionUtil.java b/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinActionUtil.java index ed8fd3931de..b64fb1f8c5a 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinActionUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinActionUtil.java @@ -21,13 +21,17 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.ex.MessagesEx; import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiJavaFile; import com.intellij.psi.PsiManager; import com.intellij.psi.codeStyle.CodeStyleManager; +import kotlin.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.j2k.JavaToKotlinConverter; +import org.jetbrains.jet.j2k.PostProcessor; +import org.jetbrains.jet.plugin.j2k.J2kPostProcessor; import java.io.IOException; import java.util.*; @@ -124,7 +128,8 @@ public class JavaToKotlinActionUtil { try { VirtualFile virtualFile = psiFile.getVirtualFile(); if (psiFile instanceof PsiJavaFile && virtualFile != null) { - String result = converter.elementToKotlin(psiFile); + J2kPostProcessor postProcessor = new J2kPostProcessor(psiFile); + String result = converter.elementsToKotlin(new Pair(psiFile, postProcessor)).get(0); //TODO: convert all files in one call! PsiManager manager = psiFile.getManager(); assert manager != null; VirtualFile copy = virtualFile.copy(manager, virtualFile.getParent(), virtualFile.getNameWithoutExtension() + ".kt"); diff --git a/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt b/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt index 6a5fdc7ef05..d8d13934933 100644 --- a/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt @@ -32,8 +32,8 @@ import org.jetbrains.jet.plugin.editor.JetEditorOptions import java.awt.datatransfer.Transferable import com.intellij.openapi.util.TextRange import com.intellij.psi.codeStyle.CodeStyleManager -import org.jetbrains.jet.plugin.j2k.J2kPostProcessor; import com.intellij.lang.java.JavaLanguage +import org.jetbrains.jet.plugin.j2k.J2kPostProcessor public class ConvertJavaCopyPastePostProcessor() : CopyPastePostProcessor() { @@ -89,8 +89,7 @@ public class ConvertJavaCopyPastePostProcessor() : CopyPastePostProcessor): String + val usageProcessings: Collection + } + + public fun convert(): IntermediateResult? { + val element = convertTopElement(elementToConvert) ?: return null + return object: IntermediateResult { + override fun finishConversion(usageProcessings: Collection): String { + unfoldLazyElements(usageProcessings) + + val builder = CodeBuilder(elementToConvert) + builder.append(element) + return builder.result + } + + override val usageProcessings: Collection = commonState.usageProcessings + } + } private fun convertTopElement(element: PsiElement): Element? = when (element) { is PsiJavaFile -> convertFile(element) @@ -88,10 +106,7 @@ class Converter private(private val elementToConvert: PsiElement, else -> null } - public val usageProcessings: Collection - get() = commonState.usageProcessings - - public fun unfoldLazyElements(usageProcessings: Collection) { + private fun unfoldLazyElements(usageProcessings: Collection) { val codeConverter = createDefaultCodeConverter().withSpecialExpressionConverter(UsageProcessingExpressionConverter(usageProcessings)) // we use loop with index because new lazy elements can be added during unfolding diff --git a/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinConverter.kt b/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinConverter.kt index e319a8ac6c9..dc6143b080c 100644 --- a/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinConverter.kt +++ b/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinConverter.kt @@ -24,7 +24,8 @@ import com.intellij.psi.PsiJavaFile import org.jetbrains.jet.lang.psi.JetFile import org.jetbrains.jet.lang.resolve.BindingContext import com.intellij.openapi.diagnostic.Logger -import org.jetbrains.jet.j2k.usageProcessing.UsageProcessingExpressionConverter +import java.util.ArrayList +import org.jetbrains.jet.j2k.usageProcessing.UsageProcessing public trait ConversionScope { public fun contains(element: PsiElement): Boolean @@ -42,43 +43,52 @@ public trait PostProcessor { public class JavaToKotlinConverter(private val project: Project, private val settings: ConverterSettings, - private val conversionScope: ConversionScope, - private val referenceSearcher: ReferenceSearcher, - private val postProcessor: PostProcessor?) { + private val conversionScope: ConversionScope /*TODO: drop this parameter*/, + private val referenceSearcher: ReferenceSearcher) { private val LOG = Logger.getInstance("#org.jetbrains.jet.j2k.JavaToKotlinConverter") - //TODO: run not for one element when multiple files - public fun elementToKotlin(psiElement: PsiElement): String { + public fun elementsToKotlin(vararg psiElementsAndProcessors: Pair): List { try { - val converter = Converter.create(psiElement, settings, conversionScope, referenceSearcher, postProcessor) - val element = converter.convert() ?: return "" + val intermediateResults = ArrayList(psiElementsAndProcessors.size) + val usageProcessings = ArrayList() + for ((psiElement, postProcessor) in psiElementsAndProcessors) { + val converter = Converter.create(psiElement, settings, conversionScope, referenceSearcher, postProcessor) + val result = converter.convert() + intermediateResults.add(result) + result?.usageProcessings?.let { usageProcessings.addAll(it) } + } - converter.unfoldLazyElements(converter.usageProcessings) + val results = ArrayList(psiElementsAndProcessors.size) + for (result in intermediateResults) { + results.add(result?.finishConversion(usageProcessings) ?: "") + } - val builder = CodeBuilder(psiElement) - builder.append(element) - - if (postProcessor != null) { - try { - return AfterConversionPass(project, postProcessor).run(builder.result) + val finalResults = ArrayList(psiElementsAndProcessors.size) + for ((i, result) in results.withIndices()) { + val postProcessor = psiElementsAndProcessors[i].second + if (postProcessor != null) { + try { + finalResults.add(AfterConversionPass(project, postProcessor).run(result)) + } + catch(e: ProcessCanceledException) { + throw e + } + catch(t: Throwable) { + LOG.error(t) + finalResults.add(result) + } } - catch(e: ProcessCanceledException) { - throw e - } - catch(t: Throwable) { - LOG.error(t) - return builder.result + else { + finalResults.add(result) } } - else { - return builder.result - } + return finalResults } catch(e: ElementCreationStackTraceRequiredException) { // if we got this exception then we need to turn element creation stack traces on to get better diagnostic Element.saveCreationStacktraces = true try { - return elementToKotlin(psiElement) + return elementsToKotlin(*psiElementsAndProcessors) } finally { Element.saveCreationStacktraces = false diff --git a/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.kt b/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.kt index 006f77ed77d..9d30da71d50 100644 --- a/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.kt +++ b/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.kt @@ -90,8 +90,8 @@ public object JavaToKotlinTranslator { fun generateKotlinCode(javaCode: String): String { val file = createFile(javaCode) if (file is PsiJavaFile) { - val converter = JavaToKotlinConverter(file.getProject(), ConverterSettings.defaultSettings, FilesConversionScope(listOf(file)), EmptyReferenceSearcher, null) - return prettify(converter.elementToKotlin(file)) + val converter = JavaToKotlinConverter(file.getProject(), ConverterSettings.defaultSettings, FilesConversionScope(listOf(file)), EmptyReferenceSearcher) + return prettify(converter.elementsToKotlin(file to null)[0]) } return "" } diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterMultiFileTest.kt b/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterMultiFileTest.kt new file mode 100644 index 00000000000..ce82cdaae38 --- /dev/null +++ b/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterMultiFileTest.kt @@ -0,0 +1,68 @@ +/* + * Copyright 2010-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.j2k.test + +import java.io.File +import com.intellij.testFramework.LightPlatformTestCase +import com.intellij.psi.codeStyle.CodeStyleManager +import org.jetbrains.jet.JetTestUtils +import com.intellij.openapi.project.Project +import com.intellij.openapi.command.WriteCommandAction +import org.jetbrains.jet.j2k.FilesConversionScope +import org.jetbrains.jet.plugin.j2k.J2kPostProcessor +import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor +import com.intellij.psi.PsiJavaFile +import org.jetbrains.jet.j2k.IdeaReferenceSearcher +import org.jetbrains.jet.j2k.JavaToKotlinConverter +import com.intellij.psi.PsiManager +import java.util.ArrayList +import org.jetbrains.jet.j2k.ConverterSettings + +public abstract class AbstractJavaToKotlinConverterMultiFileTest() : AbstractJavaToKotlinConverterTest() { + public fun doTest(dirPath: String) { + val project = LightPlatformTestCase.getProject()!! + + val javaFiles = File(dirPath).listFiles {(file, name): Boolean -> name.endsWith(".java") } + val psiFiles = ArrayList() + for (javaFile: File in javaFiles) { + val virtualFile = addFile(javaFile, "test") + val psiFile = PsiManager.getInstance(project).findFile(virtualFile) as PsiJavaFile + psiFiles.add(psiFile) + } + + val converter = JavaToKotlinConverter(project, ConverterSettings.defaultSettings, FilesConversionScope(psiFiles), IdeaReferenceSearcher) + val results: List = converter.elementsToKotlin(*psiFiles.map { it to J2kPostProcessor(it) }.copyToArray()) + .map { reformat(it, project) } + + for ((i, javaFile) in javaFiles.withIndices()) { + val kotlinPath = javaFile.getPath().replace(".java", ".kt") + val expectedFile = File(kotlinPath) + JetTestUtils.assertEqualsToFile(expectedFile, results[i]) + } + } + + private fun reformat(text: String, project: Project): String { + val convertedFile = JetTestUtils.createFile("converted", text, project) + WriteCommandAction.runWriteCommandAction(project) { + CodeStyleManager.getInstance(project)!!.reformat(convertedFile) + } + return convertedFile.getText()!! + } + + override fun getProjectDescriptor() + = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE +} diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterSingleFileTest.kt b/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterSingleFileTest.kt new file mode 100644 index 00000000000..3dbcbbf7491 --- /dev/null +++ b/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterSingleFileTest.kt @@ -0,0 +1,149 @@ +/* + * Copyright 2010-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.j2k.test + +import java.io.File +import com.intellij.openapi.util.io.FileUtil +import org.jetbrains.jet.j2k.ConverterSettings +import java.util.regex.Pattern +import com.intellij.testFramework.LightPlatformTestCase +import com.intellij.psi.codeStyle.CodeStyleManager +import org.jetbrains.jet.JetTestUtils +import com.intellij.openapi.project.Project +import com.intellij.openapi.command.WriteCommandAction +import org.jetbrains.jet.test.util.trimIndent +import org.jetbrains.jet.j2k.FilesConversionScope +import org.jetbrains.jet.plugin.j2k.J2kPostProcessor +import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor +import com.intellij.psi.PsiJavaFile +import org.jetbrains.jet.j2k.IdeaReferenceSearcher +import org.jetbrains.jet.j2k.JavaToKotlinConverter + +public abstract class AbstractJavaToKotlinConverterSingleFileTest() : AbstractJavaToKotlinConverterTest() { + val testHeaderPattern = Pattern.compile("//(element|expression|statement|method|class|file|comp)\n") + + public fun doTest(javaPath: String) { + val project = LightPlatformTestCase.getProject()!! + val javaFile = File(javaPath) + val fileContents = FileUtil.loadFile(javaFile, true) + val matcher = testHeaderPattern.matcher(fileContents) + + val (prefix, javaCode) = if (matcher.find()) { + Pair(matcher.group().trim().substring(2), matcher.replaceFirst("")) + } + else { + Pair("file", fileContents) + } + + fun parseBoolean(text: String): Boolean = when (text) { + "true" -> true + "false" -> false + else -> throw IllegalArgumentException("Unknown option value: $text") + } + + var settings = ConverterSettings.defaultSettings.copy() + val directives = JetTestUtils.parseDirectives(javaCode) + for ((name, value) in directives) { + when (name) { + "forceNotNullTypes" -> settings.forceNotNullTypes = parseBoolean(value) + "specifyLocalVariableTypeByDefault" -> settings.specifyLocalVariableTypeByDefault = parseBoolean(value) + "specifyFieldTypeByDefault" -> settings.specifyFieldTypeByDefault = parseBoolean(value) + "openByDefault" -> settings.openByDefault = parseBoolean(value) + else -> throw IllegalArgumentException("Unknown option: $name") + } + } + + val rawConverted = when (prefix) { + "element" -> elementToKotlin(javaCode, settings, project) + "expression" -> expressionToKotlin(javaCode, settings, project) + "statement" -> statementToKotlin(javaCode, settings, project) + "method" -> methodToKotlin(javaCode, settings, project) + "class" -> fileToKotlin(javaCode, settings, project) + "file" -> fileToKotlin(javaCode, settings, project) + else -> throw IllegalStateException("Specify what is it: file, class, method, statement or expression " + + "using the first line of test data file") + } + + val reformatInFun = prefix in setOf("element", "expression", "statement") + + val actual = reformat(rawConverted, project, reformatInFun) + val kotlinPath = javaPath.replace(".java", ".kt") + val expectedFile = File(kotlinPath) + JetTestUtils.assertEqualsToFile(expectedFile, actual) + } + + private fun reformat(text: String, project: Project, inFunContext: Boolean): String { + val textToFormat = if (inFunContext) "fun convertedTemp() {\n$text\n}" else text + + val convertedFile = JetTestUtils.createFile("converted", textToFormat, project) + WriteCommandAction.runWriteCommandAction(project) { + CodeStyleManager.getInstance(project)!!.reformat(convertedFile) + } + + val reformattedText = convertedFile.getText()!! + + return if (inFunContext) + reformattedText.removeFirstLine().removeLastLine().trimIndent() + else + reformattedText + } + + private fun elementToKotlin(text: String, settings: ConverterSettings, project: Project): String { + val fileWithText = createJavaFile(text) + val converter = JavaToKotlinConverter(project, settings, FilesConversionScope(listOf(fileWithText)), IdeaReferenceSearcher) + val element = fileWithText.getFirstChild()!! + return converter.elementsToKotlin(element to J2kPostProcessor(fileWithText))[0] + } + + private fun fileToKotlin(text: String, settings: ConverterSettings, project: Project): String { + val file = createJavaFile(text) + val converter = JavaToKotlinConverter(project, settings, FilesConversionScope(listOf(file)), IdeaReferenceSearcher) + return converter.elementsToKotlin(file to J2kPostProcessor(file))[0] + } + + private fun methodToKotlin(text: String, settings: ConverterSettings, project: Project): String { + val result = fileToKotlin("final class C {" + text + "}", settings, project).replaceAll("class C \\{", "") + return result.substring(0, (result.lastIndexOf("}"))).trim() + } + + private fun statementToKotlin(text: String, settings: ConverterSettings, project: Project): String { + val result = methodToKotlin("void main() {" + text + "}", settings, project) + return result.substring(0, result.lastIndexOf("}")).replaceFirst("fun main\\(\\) \\{", "").trim() + } + + private fun expressionToKotlin(code: String, settings: ConverterSettings, project: Project): String { + val result = statementToKotlin("final Object o =" + code + "}", settings, project) + return result.replaceFirst("val o:Any\\? = ", "").replaceFirst("val o:Any = ", "").replaceFirst("val o = ", "").trim() + } + + override fun getProjectDescriptor() + = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE + + private fun String.removeFirstLine(): String { + val lastNewLine = indexOf('\n') + return if (lastNewLine == -1) "" else substring(lastNewLine) + } + + private fun String.removeLastLine(): String { + val lastNewLine = lastIndexOf('\n') + return if (lastNewLine == -1) "" else substring(0, lastNewLine) + } + + private fun createJavaFile(text: String): PsiJavaFile { + return myFixture.configureByText("converterTestFile.java", text) as PsiJavaFile + } +} diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt b/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt index b0f08373111..9a488935274 100644 --- a/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt +++ b/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt @@ -16,169 +16,51 @@ package org.jetbrains.jet.j2k.test -import java.io.File import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.jet.j2k.ConverterSettings -import java.util.regex.Pattern +import java.io.File import com.intellij.testFramework.LightPlatformTestCase -import com.intellij.psi.codeStyle.CodeStyleManager -import org.jetbrains.jet.JetTestUtils -import com.intellij.openapi.project.Project -import com.intellij.openapi.command.WriteCommandAction import com.intellij.openapi.application.ApplicationManager -import org.jetbrains.jet.test.util.trimIndent -import org.jetbrains.jet.j2k.FilesConversionScope -import org.jetbrains.jet.plugin.j2k.J2kPostProcessor import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase -import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor -import com.intellij.psi.PsiJavaFile -import org.jetbrains.jet.j2k.IdeaReferenceSearcher +import com.intellij.openapi.vfs.VirtualFile +import com.intellij.openapi.util.Computable import junit.framework.TestCase import org.jetbrains.jet.j2k.translateToKotlin -import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess -import org.jetbrains.jet.JetTestCaseBuilder import com.intellij.openapi.util.Disposer -import org.jetbrains.jet.j2k.JavaToKotlinConverter import org.jetbrains.jet.j2k.JavaToKotlinTranslator +import org.jetbrains.jet.JetTestCaseBuilder +import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess -public abstract class AbstractJavaToKotlinConverterTest() : LightCodeInsightFixtureTestCase() { - val testHeaderPattern = Pattern.compile("//(element|expression|statement|method|class|file|comp)\n") - +public abstract class AbstractJavaToKotlinConverterTest : LightCodeInsightFixtureTestCase() { override fun setUp() { super.setUp() VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()) - fun addFile(fileName: String, packageName: String) { - val code = FileUtil.loadFile(File("j2k/tests/testData/$fileName"), true) - val root = LightPlatformTestCase.getSourceRoot()!! - val dir = root.findChild(packageName) ?: root.createChildDirectory(null, packageName) - val file = dir.createChildData(null, fileName)!! - file.getOutputStream(null)!!.writer().use { it.write(code) } - } - - ApplicationManager.getApplication()!!.runWriteAction{ - addFile("KotlinApi.kt", "kotlinApi") - addFile("JavaApi.java", "javaApi") - } + addFile("KotlinApi.kt", "kotlinApi") + addFile("JavaApi.java", "javaApi") } override fun tearDown() { VfsRootAccess.disallowRootAccess(JetTestCaseBuilder.getHomeDirectory()) - super.tearDown() + super.tearDown() + } + + private fun addFile(fileName: String, packageName: String) { + addFile(File("j2k/tests/testData/$fileName"), packageName) } - public fun doTest(javaPath: String) { - val project = LightPlatformTestCase.getProject()!! - val javaFile = File(javaPath) - val fileContents = FileUtil.loadFile(javaFile, true) - val matcher = testHeaderPattern.matcher(fileContents) - - val (prefix, javaCode) = if (matcher.find()) { - Pair(matcher.group().trim().substring(2), matcher.replaceFirst("")) - } - else { - Pair("file", fileContents) - } - - fun parseBoolean(text: String): Boolean = when (text) { - "true" -> true - "false" -> false - else -> throw IllegalArgumentException("Unknown option value: $text") - } - - var settings = ConverterSettings.defaultSettings.copy() - val directives = JetTestUtils.parseDirectives(javaCode) - for ((name, value) in directives) { - when (name) { - "forceNotNullTypes" -> settings.forceNotNullTypes = parseBoolean(value) - "specifyLocalVariableTypeByDefault" -> settings.specifyLocalVariableTypeByDefault = parseBoolean(value) - "specifyFieldTypeByDefault" -> settings.specifyFieldTypeByDefault = parseBoolean(value) - "openByDefault" -> settings.openByDefault = parseBoolean(value) - else -> throw IllegalArgumentException("Unknown option: $name") + fun addFile(file: File, packageName: String): VirtualFile { + return ApplicationManager.getApplication()!!.runWriteAction(object: Computable { + override fun compute(): VirtualFile? { + val code = FileUtil.loadFile(file, true) + val root = LightPlatformTestCase.getSourceRoot()!! + val virtualDir = root.findChild(packageName) ?: root.createChildDirectory(null, packageName) + val virtualFile = virtualDir.createChildData(null, file.getName())!! + virtualFile.getOutputStream(null)!!.writer().use { it.write(code) } + return virtualFile } - } - - val rawConverted = when (prefix) { - "element" -> elementToKotlin(javaCode, settings, project) - "expression" -> expressionToKotlin(javaCode, settings, project) - "statement" -> statementToKotlin(javaCode, settings, project) - "method" -> methodToKotlin(javaCode, settings, project) - "class" -> fileToKotlin(javaCode, settings, project) - "file" -> fileToKotlin(javaCode, settings, project) - else -> throw IllegalStateException("Specify what is it: file, class, method, statement or expression " + - "using the first line of test data file") - } - - val reformatInFun = prefix in setOf("element", "expression", "statement") - - val actual = reformat(rawConverted, project, reformatInFun) - val kotlinPath = javaPath.replace(".java", ".kt") - val expectedFile = File(kotlinPath) - JetTestUtils.assertEqualsToFile(expectedFile, actual) + }) } - - private fun reformat(text: String, project: Project, inFunContext: Boolean): String { - val textToFormat = if (inFunContext) "fun convertedTemp() {\n$text\n}" else text - - val convertedFile = JetTestUtils.createFile("converted", textToFormat, project) - WriteCommandAction.runWriteCommandAction(project) { - CodeStyleManager.getInstance(project)!!.reformat(convertedFile) - } - - val reformattedText = convertedFile.getText()!! - - return if (inFunContext) - reformattedText.removeFirstLine().removeLastLine().trimIndent() - else - reformattedText - } - - private fun elementToKotlin(text: String, settings: ConverterSettings, project: Project): String { - val fileWithText = createJavaFile(text) - val converter = JavaToKotlinConverter(project, settings, FilesConversionScope(listOf(fileWithText)), IdeaReferenceSearcher, J2kPostProcessor(fileWithText)) - val element = fileWithText.getFirstChild()!! - return converter.elementToKotlin(element) - } - - private fun fileToKotlin(text: String, settings: ConverterSettings, project: Project): String { - val file = createJavaFile(text) - val converter = JavaToKotlinConverter(project, settings, FilesConversionScope(listOf(file)), IdeaReferenceSearcher, J2kPostProcessor(file)) - return converter.elementToKotlin(file) - } - - private fun methodToKotlin(text: String, settings: ConverterSettings, project: Project): String { - val result = fileToKotlin("final class C {" + text + "}", settings, project).replaceAll("class C \\{", "") - return result.substring(0, (result.lastIndexOf("}"))).trim() - } - - private fun statementToKotlin(text: String, settings: ConverterSettings, project: Project): String { - val result = methodToKotlin("void main() {" + text + "}", settings, project) - return result.substring(0, result.lastIndexOf("}")).replaceFirst("fun main\\(\\) \\{", "").trim() - } - - private fun expressionToKotlin(code: String, settings: ConverterSettings, project: Project): String { - val result = statementToKotlin("final Object o =" + code + "}", settings, project) - return result.replaceFirst("val o:Any\\? = ", "").replaceFirst("val o:Any = ", "").replaceFirst("val o = ", "").trim() - } - - override fun getProjectDescriptor() - = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE - - private fun String.removeFirstLine(): String { - val lastNewLine = indexOf('\n') - return if (lastNewLine == -1) "" else substring(lastNewLine) - } - - private fun String.removeLastLine(): String { - val lastNewLine = lastIndexOf('\n') - return if (lastNewLine == -1) "" else substring(0, lastNewLine) - } - - private fun createJavaFile(text: String): PsiJavaFile { - return myFixture.configureByText("converterTestFile.java", text) as PsiJavaFile - } - } public abstract class AbstractJavaToKotlinConverterForWebDemoTest() : TestCase() { diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterForWebDemoTestGenerated.java b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterForWebDemoTestGenerated.java index ee2284903bc..9ca959f0cfe 100644 --- a/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterForWebDemoTestGenerated.java +++ b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterForWebDemoTestGenerated.java @@ -28,3878 +28,3902 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("j2k/tests/testData/ast") +@TestMetadata("j2k/tests/testData/fileOrElement") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({JavaToKotlinConverterForWebDemoTestGenerated.Annotations.class, JavaToKotlinConverterForWebDemoTestGenerated.AnonymousBlock.class, JavaToKotlinConverterForWebDemoTestGenerated.ArrayAccessExpression.class, JavaToKotlinConverterForWebDemoTestGenerated.ArrayInitializerExpression.class, JavaToKotlinConverterForWebDemoTestGenerated.ArrayType.class, JavaToKotlinConverterForWebDemoTestGenerated.AssertStatement.class, JavaToKotlinConverterForWebDemoTestGenerated.AssignmentExpression.class, JavaToKotlinConverterForWebDemoTestGenerated.BinaryExpression.class, JavaToKotlinConverterForWebDemoTestGenerated.Blocks.class, JavaToKotlinConverterForWebDemoTestGenerated.BoxedType.class, JavaToKotlinConverterForWebDemoTestGenerated.BreakStatement.class, JavaToKotlinConverterForWebDemoTestGenerated.CallChainExpression.class, JavaToKotlinConverterForWebDemoTestGenerated.Class.class, JavaToKotlinConverterForWebDemoTestGenerated.ClassExpression.class, JavaToKotlinConverterForWebDemoTestGenerated.Comments.class, JavaToKotlinConverterForWebDemoTestGenerated.ConditionalExpression.class, JavaToKotlinConverterForWebDemoTestGenerated.Constructors.class, JavaToKotlinConverterForWebDemoTestGenerated.ContinueStatement.class, JavaToKotlinConverterForWebDemoTestGenerated.DeclarationStatement.class, JavaToKotlinConverterForWebDemoTestGenerated.DoWhileStatement.class, JavaToKotlinConverterForWebDemoTestGenerated.DropAccessors.class, JavaToKotlinConverterForWebDemoTestGenerated.Enum.class, JavaToKotlinConverterForWebDemoTestGenerated.Equals.class, JavaToKotlinConverterForWebDemoTestGenerated.Field.class, JavaToKotlinConverterForWebDemoTestGenerated.For.class, JavaToKotlinConverterForWebDemoTestGenerated.ForeachStatement.class, JavaToKotlinConverterForWebDemoTestGenerated.Formatting.class, JavaToKotlinConverterForWebDemoTestGenerated.Function.class, JavaToKotlinConverterForWebDemoTestGenerated.Identifier.class, JavaToKotlinConverterForWebDemoTestGenerated.IfStatement.class, JavaToKotlinConverterForWebDemoTestGenerated.ImportStatement.class, JavaToKotlinConverterForWebDemoTestGenerated.InProjectionType.class, JavaToKotlinConverterForWebDemoTestGenerated.Inheritance.class, JavaToKotlinConverterForWebDemoTestGenerated.IsOperator.class, JavaToKotlinConverterForWebDemoTestGenerated.Issues.class, JavaToKotlinConverterForWebDemoTestGenerated.KotlinApiAccess.class, JavaToKotlinConverterForWebDemoTestGenerated.LabelStatement.class, JavaToKotlinConverterForWebDemoTestGenerated.List.class, JavaToKotlinConverterForWebDemoTestGenerated.LiteralExpression.class, JavaToKotlinConverterForWebDemoTestGenerated.LocalVariable.class, JavaToKotlinConverterForWebDemoTestGenerated.MethodCallExpression.class, JavaToKotlinConverterForWebDemoTestGenerated.Misc.class, JavaToKotlinConverterForWebDemoTestGenerated.NewClassExpression.class, JavaToKotlinConverterForWebDemoTestGenerated.Nullability.class, JavaToKotlinConverterForWebDemoTestGenerated.ObjectLiteral.class, JavaToKotlinConverterForWebDemoTestGenerated.OutProjectionType.class, JavaToKotlinConverterForWebDemoTestGenerated.PackageStatement.class, JavaToKotlinConverterForWebDemoTestGenerated.ParenthesizedExpression.class, JavaToKotlinConverterForWebDemoTestGenerated.PolyadicExpression.class, JavaToKotlinConverterForWebDemoTestGenerated.PostfixOperator.class, JavaToKotlinConverterForWebDemoTestGenerated.PrefixOperator.class, JavaToKotlinConverterForWebDemoTestGenerated.RawGenerics.class, JavaToKotlinConverterForWebDemoTestGenerated.ReturnStatement.class, JavaToKotlinConverterForWebDemoTestGenerated.Settings.class, JavaToKotlinConverterForWebDemoTestGenerated.StarProjectionType.class, JavaToKotlinConverterForWebDemoTestGenerated.StaticMembers.class, JavaToKotlinConverterForWebDemoTestGenerated.SuperExpression.class, JavaToKotlinConverterForWebDemoTestGenerated.Switch.class, JavaToKotlinConverterForWebDemoTestGenerated.SynchronizedStatement.class, JavaToKotlinConverterForWebDemoTestGenerated.ThisExpression.class, JavaToKotlinConverterForWebDemoTestGenerated.ThrowStatement.class, JavaToKotlinConverterForWebDemoTestGenerated.ToKotlinClasses.class, JavaToKotlinConverterForWebDemoTestGenerated.Trait.class, JavaToKotlinConverterForWebDemoTestGenerated.TryStatement.class, JavaToKotlinConverterForWebDemoTestGenerated.TryWithResource.class, JavaToKotlinConverterForWebDemoTestGenerated.TypeCastExpression.class, JavaToKotlinConverterForWebDemoTestGenerated.TypeParameters.class, JavaToKotlinConverterForWebDemoTestGenerated.VarArg.class, JavaToKotlinConverterForWebDemoTestGenerated.WhileStatement.class}) @RunWith(JUnit3RunnerWithInners.class) public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaToKotlinConverterForWebDemoTest { - public void testAllFilesPresentInAst() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast"), Pattern.compile("^(.+)\\.java$"), true); + public void testAllFilesPresentInFileOrElement() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement"), Pattern.compile("^(.+)\\.java$"), true); } - @TestMetadata("j2k/tests/testData/ast/annotations") + @TestMetadata("j2k/tests/testData/fileOrElement/annotations") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Annotations extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/annotations"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/annotations"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("annotationInterface1.java") public void testAnnotationInterface1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/annotations/annotationInterface1.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/annotations/annotationInterface1.java"); doTest(fileName); } @TestMetadata("annotationInterface2.java") public void testAnnotationInterface2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/annotations/annotationInterface2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/annotations/annotationInterface2.java"); doTest(fileName); } @TestMetadata("annotationInterface3.java") public void testAnnotationInterface3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/annotations/annotationInterface3.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/annotations/annotationInterface3.java"); doTest(fileName); } @TestMetadata("annotationUsages.java") public void testAnnotationUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/annotations/annotationUsages.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/annotations/annotationUsages.java"); doTest(fileName); } @TestMetadata("jetbrainsNotNull.java") public void testJetbrainsNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/annotations/jetbrainsNotNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/annotations/jetbrainsNotNull.java"); doTest(fileName); } @TestMetadata("jetbrainsNotNullChainExpr.java") public void testJetbrainsNotNullChainExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.java"); doTest(fileName); } @TestMetadata("jetbrainsNullable.java") public void testJetbrainsNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/annotations/jetbrainsNullable.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/annotations/jetbrainsNullable.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/anonymousBlock") + @TestMetadata("j2k/tests/testData/fileOrElement/anonymousBlock") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class AnonymousBlock extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInAnonymousBlock() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/anonymousBlock"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/anonymousBlock"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("oneAnonBlock.java") public void testOneAnonBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/anonymousBlock/oneAnonBlock.java"); doTest(fileName); } @TestMetadata("oneStaticAnonBlock.java") public void testOneStaticAnonBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/arrayAccessExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/arrayAccessExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class ArrayAccessExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInArrayAccessExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/arrayAccessExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/arrayAccessExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("expressionIndex.java") public void testExpressionIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayAccessExpression/expressionIndex.java"); doTest(fileName); } @TestMetadata("intIndex.java") public void testIntIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayAccessExpression/intIndex.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayAccessExpression/intIndex.java"); doTest(fileName); } @TestMetadata("variableIndex.java") public void testVariableIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayAccessExpression/variableIndex.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayAccessExpression/variableIndex.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/arrayInitializerExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class ArrayInitializerExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInArrayInitializerExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/arrayInitializerExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/arrayInitializerExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("doubleArray.java") public void testDoubleArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/doubleArray.java"); doTest(fileName); } @TestMetadata("doubleArrayWithVariables.java") public void testDoubleArrayWithVariables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/doubleArrayWithVariables.java"); doTest(fileName); } @TestMetadata("floatArray.java") public void testFloatArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/floatArray.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/floatArray.java"); doTest(fileName); } @TestMetadata("intArrayWithLength.java") public void testIntArrayWithLength() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/intArrayWithLength.java"); doTest(fileName); } @TestMetadata("javaLangDoubleArray.java") public void testJavaLangDoubleArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/javaLangDoubleArray.java"); doTest(fileName); } @TestMetadata("javaLangFloatArray.java") public void testJavaLangFloatArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/javaLangFloatArray.java"); doTest(fileName); } @TestMetadata("newByte.java") public void testNewByte() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/newByte.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/newByte.java"); doTest(fileName); } @TestMetadata("newInt.java") public void testNewInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/newInt.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/newInt.java"); doTest(fileName); } @TestMetadata("objectArrayWithLength.java") public void testObjectArrayWithLength() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/objectArrayWithLength.java"); doTest(fileName); } @TestMetadata("oneDim.java") public void testOneDim() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/oneDim.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/oneDim.java"); doTest(fileName); } @TestMetadata("oneDimWithVariables.java") public void testOneDimWithVariables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/oneDimWithVariables.java"); doTest(fileName); } @TestMetadata("twoDim.java") public void testTwoDim() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/twoDim.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/twoDim.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/arrayType") + @TestMetadata("j2k/tests/testData/fileOrElement/arrayType") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class ArrayType extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInArrayType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/arrayType"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/arrayType"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("arrayInitializationStatement.java") public void testArrayInitializationStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/arrayInitializationStatement.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatement.java"); doTest(fileName); } @TestMetadata("arrayInitializationStatementWithDimension.java") public void testArrayInitializationStatementWithDimension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension.java"); doTest(fileName); } @TestMetadata("arrayInitializationStatementWithDimension3d.java") public void testArrayInitializationStatementWithDimension3d() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension3d.java"); doTest(fileName); } @TestMetadata("arrayInitializationStatementWithDimensionExplicit.java") public void testArrayInitializationStatementWithDimensionExplicit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimensionExplicit.java"); doTest(fileName); } @TestMetadata("d2StringEmptyArray.java") public void testD2StringEmptyArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/d2StringEmptyArray.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayType/d2StringEmptyArray.java"); doTest(fileName); } @TestMetadata("d3StringEmptyArray.java") public void testD3StringEmptyArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/d3StringEmptyArray.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayType/d3StringEmptyArray.java"); doTest(fileName); } @TestMetadata("longArray.java") public void testLongArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/longArray.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayType/longArray.java"); doTest(fileName); } @TestMetadata("methodArrayArgs.java") public void testMethodArrayArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/methodArrayArgs.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayType/methodArrayArgs.java"); doTest(fileName); } @TestMetadata("newIntArray.java") public void testNewIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/newIntArray.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayType/newIntArray.java"); doTest(fileName); } @TestMetadata("newStringArray.java") public void testNewStringArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/newStringArray.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayType/newStringArray.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/assertStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/assertStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class AssertStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInAssertStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/assertStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/assertStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("onlyCondition.java") public void testOnlyCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assertStatement/onlyCondition.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assertStatement/onlyCondition.java"); doTest(fileName); } @TestMetadata("onlyConditionWithBraces.java") public void testOnlyConditionWithBraces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assertStatement/onlyConditionWithBraces.java"); doTest(fileName); } @TestMetadata("withStringDetail.java") public void testWithStringDetail() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assertStatement/withStringDetail.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assertStatement/withStringDetail.java"); doTest(fileName); } @TestMetadata("withStringDetail2.java") public void testWithStringDetail2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assertStatement/withStringDetail2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assertStatement/withStringDetail2.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/assignmentExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/assignmentExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class AssignmentExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInAssignmentExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/assignmentExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/assignmentExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("and.java") public void testAnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/and.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/and.java"); doTest(fileName); } @TestMetadata("assignment.java") public void testAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/assignment.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/assignment.java"); doTest(fileName); } @TestMetadata("divideAssign.java") public void testDivideAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/divideAssign.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/divideAssign.java"); doTest(fileName); } @TestMetadata("minusAssign.java") public void testMinusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/minusAssign.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/minusAssign.java"); doTest(fileName); } @TestMetadata("multiplyAssign.java") public void testMultiplyAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/multiplyAssign.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/multiplyAssign.java"); doTest(fileName); } @TestMetadata("nullability.java") public void testNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/nullability.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/nullability.java"); doTest(fileName); } @TestMetadata("nullability-settings.java") public void testNullability_settings() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/nullability-settings.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/nullability-settings.java"); doTest(fileName); } @TestMetadata("or.java") public void testOr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/or.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/or.java"); doTest(fileName); } @TestMetadata("plusAssign.java") public void testPlusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/plusAssign.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/plusAssign.java"); doTest(fileName); } @TestMetadata("reminder.java") public void testReminder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/reminder.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/reminder.java"); doTest(fileName); } @TestMetadata("shiftLeft.java") public void testShiftLeft() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/shiftLeft.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/shiftLeft.java"); doTest(fileName); } @TestMetadata("shiftRight.java") public void testShiftRight() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/shiftRight.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/shiftRight.java"); doTest(fileName); } @TestMetadata("simpleAssignment.java") public void testSimpleAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/simpleAssignment.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/simpleAssignment.java"); doTest(fileName); } @TestMetadata("unsignedRightShift.java") public void testUnsignedRightShift() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/unsignedRightShift.java"); doTest(fileName); } @TestMetadata("xor.java") public void testXor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/xor.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/xor.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/binaryExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/binaryExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class BinaryExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInBinaryExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/binaryExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/binaryExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("and.java") public void testAnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/and.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/and.java"); doTest(fileName); } @TestMetadata("conditionalAnd.java") public void testConditionalAnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/conditionalAnd.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/conditionalAnd.java"); doTest(fileName); } @TestMetadata("conditionalOr.java") public void testConditionalOr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/conditionalOr.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/conditionalOr.java"); doTest(fileName); } @TestMetadata("divide.java") public void testDivide() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/divide.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/divide.java"); doTest(fileName); } @TestMetadata("greaterThan.java") public void testGreaterThan() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/greaterThan.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/greaterThan.java"); doTest(fileName); } @TestMetadata("greaterThanEqual.java") public void testGreaterThanEqual() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/greaterThanEqual.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/greaterThanEqual.java"); doTest(fileName); } @TestMetadata("lessThan.java") public void testLessThan() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/lessThan.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/lessThan.java"); doTest(fileName); } @TestMetadata("lessThanEqual.java") public void testLessThanEqual() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/lessThanEqual.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/lessThanEqual.java"); doTest(fileName); } @TestMetadata("minus.java") public void testMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/minus.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/minus.java"); doTest(fileName); } @TestMetadata("multiplePlusMinus.java") public void testMultiplePlusMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/multiplePlusMinus.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/multiplePlusMinus.java"); doTest(fileName); } @TestMetadata("multiply.java") public void testMultiply() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/multiply.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/multiply.java"); doTest(fileName); } @TestMetadata("or.java") public void testOr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/or.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/or.java"); doTest(fileName); } @TestMetadata("plus.java") public void testPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/plus.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/plus.java"); doTest(fileName); } @TestMetadata("remainder.java") public void testRemainder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/remainder.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/remainder.java"); doTest(fileName); } @TestMetadata("shiftLeft.java") public void testShiftLeft() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/shiftLeft.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/shiftLeft.java"); doTest(fileName); } @TestMetadata("shiftRight.java") public void testShiftRight() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/shiftRight.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/shiftRight.java"); doTest(fileName); } @TestMetadata("unsignedRightShift.java") public void testUnsignedRightShift() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/unsignedRightShift.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/unsignedRightShift.java"); doTest(fileName); } @TestMetadata("xor.java") public void testXor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/xor.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/xor.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/blocks") + @TestMetadata("j2k/tests/testData/fileOrElement/blocks") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Blocks extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInBlocks() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/blocks"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/blocks"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("Blocks.java") public void testBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/blocks/Blocks.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/blocks/Blocks.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/boxedType") + @TestMetadata("j2k/tests/testData/fileOrElement/boxedType") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class BoxedType extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInBoxedType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/boxedType"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/boxedType"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("boolean.java") public void testBoolean() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/boolean.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/boxedType/boolean.java"); doTest(fileName); } @TestMetadata("Boxing.java") public void testBoxing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/Boxing.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/boxedType/Boxing.java"); doTest(fileName); } @TestMetadata("byte.java") public void testByte() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/byte.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/boxedType/byte.java"); doTest(fileName); } @TestMetadata("character.java") public void testCharacter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/character.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/boxedType/character.java"); doTest(fileName); } @TestMetadata("double.java") public void testDouble() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/double.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/boxedType/double.java"); doTest(fileName); } @TestMetadata("float.java") public void testFloat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/float.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/boxedType/float.java"); doTest(fileName); } @TestMetadata("integer.java") public void testInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/integer.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/boxedType/integer.java"); doTest(fileName); } @TestMetadata("kt-671.java") public void testKt_671() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/kt-671.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/boxedType/kt-671.java"); doTest(fileName); } @TestMetadata("long.java") public void testLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/long.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/boxedType/long.java"); doTest(fileName); } @TestMetadata("object.java") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/object.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/boxedType/object.java"); doTest(fileName); } @TestMetadata("short.java") public void testShort() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/short.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/boxedType/short.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/breakStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/breakStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class BreakStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInBreakStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/breakStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/breakStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("breakWithLabel.java") public void testBreakWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/breakStatement/breakWithLabel.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/breakStatement/breakWithLabel.java"); doTest(fileName); } @TestMetadata("breakWithoutLabel.java") public void testBreakWithoutLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/breakStatement/breakWithoutLabel.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/breakStatement/breakWithoutLabel.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/callChainExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/callChainExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class CallChainExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInCallChainExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/callChainExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/callChainExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("libraryFieldCall.java") public void testLibraryFieldCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/callChainExpression/libraryFieldCall.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/callChainExpression/libraryFieldCall.java"); doTest(fileName); } @TestMetadata("libraryMethodCall.java") public void testLibraryMethodCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/callChainExpression/libraryMethodCall.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/callChainExpression/libraryMethodCall.java"); doTest(fileName); } @TestMetadata("libraryMethodCallFromInstance.java") public void testLibraryMethodCallFromInstance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance.java"); doTest(fileName); } @TestMetadata("libraryMethodCallFromInstance-settings.java") public void testLibraryMethodCallFromInstance_settings() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.java"); doTest(fileName); } @TestMetadata("libraryStringFieldCall.java") public void testLibraryStringFieldCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/callChainExpression/libraryStringFieldCall.java"); doTest(fileName); } @TestMetadata("sout.java") public void testSout() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/callChainExpression/sout.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/callChainExpression/sout.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/class") + @TestMetadata("j2k/tests/testData/fileOrElement/class") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Class extends AbstractJavaToKotlinConverterForWebDemoTest { @TestMetadata("abstractClass.java") public void testAbstractClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/abstractClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/abstractClass.java"); doTest(fileName); } @TestMetadata("abstractClassShape.java") public void testAbstractClassShape() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/abstractClassShape.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/abstractClassShape.java"); doTest(fileName); } public void testAllFilesPresentInClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/class"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/class"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("class.java") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/class.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/class.java"); doTest(fileName); } @TestMetadata("ClassShadowing.java") public void testClassShadowing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/ClassShadowing.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/ClassShadowing.java"); doTest(fileName); } @TestMetadata("classWithEmptyMethods.java") public void testClassWithEmptyMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/classWithEmptyMethods.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/classWithEmptyMethods.java"); doTest(fileName); } @TestMetadata("classWithFields.java") public void testClassWithFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/classWithFields.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/classWithFields.java"); doTest(fileName); } @TestMetadata("classWithMultiplyFields.java") public void testClassWithMultiplyFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/classWithMultiplyFields.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/classWithMultiplyFields.java"); doTest(fileName); } @TestMetadata("emptyClass.java") public void testEmptyClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/emptyClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/emptyClass.java"); doTest(fileName); } @TestMetadata("extendsOneClassAndImplementsOneInterface.java") public void testExtendsOneClassAndImplementsOneInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/extendsOneClassAndImplementsOneInterface.java"); doTest(fileName); } @TestMetadata("extendsOneClassAndImplementsSeveralInterfaces.java") public void testExtendsOneClassAndImplementsSeveralInterfaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/extendsOneClassAndImplementsSeveralInterfaces.java"); doTest(fileName); } @TestMetadata("finalClass.java") public void testFinalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/finalClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/finalClass.java"); doTest(fileName); } @TestMetadata("genericClass.java") public void testGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/genericClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/genericClass.java"); doTest(fileName); } @TestMetadata("innerClassInInterface.java") public void testInnerClassInInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/innerClassInInterface.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/innerClassInInterface.java"); doTest(fileName); } @TestMetadata("innerEmptyClass.java") public void testInnerEmptyClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/innerEmptyClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/innerEmptyClass.java"); doTest(fileName); } @TestMetadata("innerEnum.java") public void testInnerEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/innerEnum.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/innerEnum.java"); doTest(fileName); } @TestMetadata("innerInterface.java") public void testInnerInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/innerInterface.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/innerInterface.java"); doTest(fileName); } @TestMetadata("innerStaticClass.java") public void testInnerStaticClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/innerStaticClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/innerStaticClass.java"); doTest(fileName); } @TestMetadata("internalClass.java") public void testInternalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/internalClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/internalClass.java"); doTest(fileName); } @TestMetadata("kt-639.java") public void testKt_639() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/kt-639.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/kt-639.java"); doTest(fileName); } @TestMetadata("oneStaticFieldOneNonStatic.java") public void testOneStaticFieldOneNonStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/oneStaticFieldOneNonStatic.java"); doTest(fileName); } @TestMetadata("oneStaticMethod.java") public void testOneStaticMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/oneStaticMethod.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/oneStaticMethod.java"); doTest(fileName); } @TestMetadata("oneStaticMethodOneNonStatic.java") public void testOneStaticMethodOneNonStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/oneStaticMethodOneNonStatic.java"); doTest(fileName); } @TestMetadata("pivateClass.java") public void testPivateClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/pivateClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/pivateClass.java"); doTest(fileName); } @TestMetadata("privateInit.java") public void testPrivateInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/privateInit.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/privateInit.java"); doTest(fileName); } @TestMetadata("protectedClass.java") public void testProtectedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/protectedClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/protectedClass.java"); doTest(fileName); } @TestMetadata("publicClass.java") public void testPublicClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/publicClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/publicClass.java"); doTest(fileName); } @TestMetadata("simpleInheritance.java") public void testSimpleInheritance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/simpleInheritance.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/simpleInheritance.java"); doTest(fileName); } @TestMetadata("twoStaticMethod.java") public void testTwoStaticMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/twoStaticMethod.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/twoStaticMethod.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/classExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/classExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class ClassExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInClassExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/classExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/classExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("complexExample.java") public void testComplexExample() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/classExpression/complexExample.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/classExpression/complexExample.java"); doTest(fileName); } @TestMetadata("objectClass.java") public void testObjectClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/classExpression/objectClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/classExpression/objectClass.java"); doTest(fileName); } @TestMetadata("primitivesAndArrays.java") public void testPrimitivesAndArrays() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/classExpression/primitivesAndArrays.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/classExpression/primitivesAndArrays.java"); doTest(fileName); } @TestMetadata("stringClass.java") public void testStringClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/classExpression/stringClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/classExpression/stringClass.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/comments") + @TestMetadata("j2k/tests/testData/fileOrElement/comments") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Comments extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInComments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/comments"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/comments"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("comments.java") public void testComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/comments/comments.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/comments/comments.java"); doTest(fileName); } @TestMetadata("comments2.java") public void testComments2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/comments/comments2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/comments/comments2.java"); doTest(fileName); } @TestMetadata("commentsForConstructors.java") public void testCommentsForConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/comments/commentsForConstructors.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/comments/commentsForConstructors.java"); doTest(fileName); } @TestMetadata("fieldWithEndOfLineComment.java") public void testFieldWithEndOfLineComment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/comments/fieldWithEndOfLineComment.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/comments/fieldWithEndOfLineComment.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams.java") public void testFieldsInitializedFromParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/comments/fieldsInitializedFromParams.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/comments/fieldsInitializedFromParams.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/conditionalExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/conditionalExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class ConditionalExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInConditionalExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/conditionalExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/conditionalExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("multiline.java") public void testMultiline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/conditionalExpression/multiline.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/conditionalExpression/multiline.java"); doTest(fileName); } @TestMetadata("simple.java") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/conditionalExpression/simple.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/conditionalExpression/simple.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/constructors") + @TestMetadata("j2k/tests/testData/fileOrElement/constructors") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Constructors extends AbstractJavaToKotlinConverterForWebDemoTest { @TestMetadata("allCallsPrimary.java") public void testAllCallsPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/allCallsPrimary.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/allCallsPrimary.java"); doTest(fileName); } @TestMetadata("allCallsPrimary2.java") public void testAllCallsPrimary2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/allCallsPrimary2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/allCallsPrimary2.java"); doTest(fileName); } public void testAllFilesPresentInConstructors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/constructors"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/constructors"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("artificialPrimary.java") public void testArtificialPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/artificialPrimary.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/artificialPrimary.java"); doTest(fileName); } @TestMetadata("chain.java") public void testChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/chain.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/chain.java"); doTest(fileName); } @TestMetadata("constructorAnnotations.java") public void testConstructorAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/constructorAnnotations.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/constructorAnnotations.java"); doTest(fileName); } @TestMetadata("customerBuilder.java") public void testCustomerBuilder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/customerBuilder.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/customerBuilder.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams1.java") public void testFieldsInitializedFromParams1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams1.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams2.java") public void testFieldsInitializedFromParams2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams2.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams3.java") public void testFieldsInitializedFromParams3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams3.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams4.java") public void testFieldsInitializedFromParams4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams4.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams5.java") public void testFieldsInitializedFromParams5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams5.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams6.java") public void testFieldsInitializedFromParams6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams6.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams7.java") public void testFieldsInitializedFromParams7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams7.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams8.java") public void testFieldsInitializedFromParams8() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams8.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams8.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams9.java") public void testFieldsInitializedFromParams9() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams9.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams9.java"); doTest(fileName); } @TestMetadata("genericIdentifier.java") public void testGenericIdentifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/genericIdentifier.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/genericIdentifier.java"); doTest(fileName); } @TestMetadata("identifier.java") public void testIdentifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/identifier.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/identifier.java"); doTest(fileName); } @TestMetadata("methodCallInFactoryFun.java") public void testMethodCallInFactoryFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/methodCallInFactoryFun.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/methodCallInFactoryFun.java"); doTest(fileName); } @TestMetadata("nestedClassNameInParameterDefaults.java") public void testNestedClassNameInParameterDefaults() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.java"); doTest(fileName); } @TestMetadata("nestedClassNameInParameterDefaults2.java") public void testNestedClassNameInParameterDefaults2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.java"); doTest(fileName); } @TestMetadata("nestedClassNameInParameterDefaults3.java") public void testNestedClassNameInParameterDefaults3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults3.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.java"); doTest(fileName); } @TestMetadata("nestedClassNameInParameterDefaults4.java") public void testNestedClassNameInParameterDefaults4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults4.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.java"); doTest(fileName); } @TestMetadata("nestedClassNameInSuperParameters.java") public void testNestedClassNameInSuperParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/nestedClassNameInSuperParameters.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.java"); doTest(fileName); } @TestMetadata("noPrimary.java") public void testNoPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/noPrimary.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/noPrimary.java"); doTest(fileName); } @TestMetadata("parameterDefaults1.java") public void testParameterDefaults1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/parameterDefaults1.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/parameterDefaults1.java"); doTest(fileName); } @TestMetadata("parameterDefaults2.java") public void testParameterDefaults2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/parameterDefaults2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/parameterDefaults2.java"); doTest(fileName); } @TestMetadata("parameterDefaults3.java") public void testParameterDefaults3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/parameterDefaults3.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/parameterDefaults3.java"); doTest(fileName); } @TestMetadata("parameterDefaults4.java") public void testParameterDefaults4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/parameterDefaults4.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/parameterDefaults4.java"); doTest(fileName); } @TestMetadata("parameterDefaults5.java") public void testParameterDefaults5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/parameterDefaults5.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/parameterDefaults5.java"); doTest(fileName); } @TestMetadata("parameterModification.java") public void testParameterModification() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/parameterModification.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/parameterModification.java"); doTest(fileName); } @TestMetadata("privateConstructors.java") public void testPrivateConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/privateConstructors.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/privateConstructors.java"); doTest(fileName); } @TestMetadata("qualifiedRefInFactoryFun.java") public void testQualifiedRefInFactoryFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/qualifiedRefInFactoryFun.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/qualifiedRefInFactoryFun.java"); doTest(fileName); } @TestMetadata("secondaryConstructorsInInnerClass.java") public void testSecondaryConstructorsInInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/secondaryConstructorsInInnerClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/secondaryConstructorsInInnerClass.java"); doTest(fileName); } @TestMetadata("secondaryConstructorsInNestedClass.java") public void testSecondaryConstructorsInNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/secondaryConstructorsInNestedClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.java"); doTest(fileName); } @TestMetadata("secondaryConstructorsVisibility.java") public void testSecondaryConstructorsVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/secondaryConstructorsVisibility.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/secondaryConstructorsVisibility.java"); doTest(fileName); } @TestMetadata("staticFieldRefInFactoryFun.java") public void testStaticFieldRefInFactoryFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/staticFieldRefInFactoryFun.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.java"); doTest(fileName); } @TestMetadata("withManyDefaultParams.java") public void testWithManyDefaultParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/withManyDefaultParams.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/withManyDefaultParams.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/continueStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/continueStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class ContinueStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInContinueStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/continueStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/continueStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("continueWithLabel.java") public void testContinueWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/continueStatement/continueWithLabel.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/continueStatement/continueWithLabel.java"); doTest(fileName); } @TestMetadata("continueWithoutLabel.java") public void testContinueWithoutLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/continueStatement/continueWithoutLabel.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/continueStatement/continueWithoutLabel.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/declarationStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/declarationStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class DeclarationStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInDeclarationStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/declarationStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/declarationStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("multiplyFinalIntDeclaration.java") public void testMultiplyFinalIntDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/declarationStatement/multiplyFinalIntDeclaration.java"); doTest(fileName); } @TestMetadata("multiplyIntDeclaration.java") public void testMultiplyIntDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/declarationStatement/multiplyIntDeclaration.java"); doTest(fileName); } @TestMetadata("singleFinalIntDeclaration.java") public void testSingleFinalIntDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/declarationStatement/singleFinalIntDeclaration.java"); doTest(fileName); } @TestMetadata("singleFinalStringDeclaration.java") public void testSingleFinalStringDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/declarationStatement/singleFinalStringDeclaration.java"); doTest(fileName); } @TestMetadata("singleIntDeclaration.java") public void testSingleIntDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/declarationStatement/singleIntDeclaration.java"); doTest(fileName); } @TestMetadata("singleStringDeclaration.java") public void testSingleStringDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/declarationStatement/singleStringDeclaration.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/doWhileStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/doWhileStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class DoWhileStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInDoWhileStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/doWhileStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/doWhileStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("whileWithBlock.java") public void testWhileWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/doWhileStatement/whileWithBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/doWhileStatement/whileWithBlock.java"); doTest(fileName); } @TestMetadata("whileWithEmptyBlock.java") public void testWhileWithEmptyBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/doWhileStatement/whileWithEmptyBlock.java"); doTest(fileName); } @TestMetadata("whileWithExpression.java") public void testWhileWithExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/doWhileStatement/whileWithExpression.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/doWhileStatement/whileWithExpression.java"); doTest(fileName); } @TestMetadata("whileWithReturn.java") public void testWhileWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/doWhileStatement/whileWithReturn.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/doWhileStatement/whileWithReturn.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/dropAccessors") + @TestMetadata("j2k/tests/testData/fileOrElement/dropAccessors") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class DropAccessors extends AbstractJavaToKotlinConverterForWebDemoTest { @TestMetadata("AccessInGetterWithThis.java") public void testAccessInGetterWithThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/AccessInGetterWithThis.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/AccessInGetterWithThis.java"); doTest(fileName); } public void testAllFilesPresentInDropAccessors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/dropAccessors"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/dropAccessors"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("CannotDropOnlySetter.java") public void testCannotDropOnlySetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/CannotDropOnlySetter.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/CannotDropOnlySetter.java"); doTest(fileName); } @TestMetadata("DataClass.java") public void testDataClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/DataClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/DataClass.java"); doTest(fileName); } @TestMetadata("DataClassWithMutableField.java") public void testDataClassWithMutableField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/DataClassWithMutableField.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/DataClassWithMutableField.java"); doTest(fileName); } @TestMetadata("DifferentFieldName.java") public void testDifferentFieldName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/DifferentFieldName.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/DifferentFieldName.java"); + doTest(fileName); + } + + @TestMetadata("DifferentFieldNameAndDefaultParameterValue.java") + public void testDifferentFieldNameAndDefaultParameterValue() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.java"); + doTest(fileName); + } + + @TestMetadata("DifferentFieldNameAndSuperClass.java") + public void testDifferentFieldNameAndSuperClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.java"); + doTest(fileName); + } + + @TestMetadata("DifferentProtectedFieldName.java") + public void testDifferentProtectedFieldName() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.java"); doTest(fileName); } @TestMetadata("DropGetter.java") public void testDropGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/DropGetter.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/DropGetter.java"); doTest(fileName); } @TestMetadata("DropGetterAndSetter.java") public void testDropGetterAndSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/DropGetterAndSetter.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/DropGetterAndSetter.java"); doTest(fileName); } @TestMetadata("DropGetterForMutable.java") public void testDropGetterForMutable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/DropGetterForMutable.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/DropGetterForMutable.java"); doTest(fileName); } @TestMetadata("FalseGetter.java") public void testFalseGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/FalseGetter.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/FalseGetter.java"); doTest(fileName); } @TestMetadata("FalseSetter.java") public void testFalseSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/FalseSetter.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/FalseSetter.java"); doTest(fileName); } @TestMetadata("FieldUsagesInFactoryMethods.java") public void testFieldUsagesInFactoryMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/FieldUsagesInFactoryMethods.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.java"); doTest(fileName); } @TestMetadata("GetterAndSetterNamesDifferent.java") public void testGetterAndSetterNamesDifferent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/GetterAndSetterNamesDifferent.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/GetterAndSetterNamesDifferent.java"); + doTest(fileName); + } + + @TestMetadata("GetterSetterUsages.java") + public void testGetterSetterUsages() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/GetterSetterUsages.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/enum") + @TestMetadata("j2k/tests/testData/fileOrElement/enum") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Enum extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInEnum() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/enum"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/enum"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("colorEnum.java") public void testColorEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/colorEnum.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/colorEnum.java"); doTest(fileName); } @TestMetadata("emptyEnum.java") public void testEmptyEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/emptyEnum.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/emptyEnum.java"); doTest(fileName); } @TestMetadata("enumConstantIsNotNull.java") public void testEnumConstantIsNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/enumConstantIsNotNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/enumConstantIsNotNull.java"); doTest(fileName); } @TestMetadata("enumImplementsOneInterface.java") public void testEnumImplementsOneInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/enumImplementsOneInterface.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/enumImplementsOneInterface.java"); doTest(fileName); } @TestMetadata("enumImplementsSeveralInterfaces.java") public void testEnumImplementsSeveralInterfaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/enumImplementsSeveralInterfaces.java"); doTest(fileName); } @TestMetadata("enumWithNameField.java") public void testEnumWithNameField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/enumWithNameField.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/enumWithNameField.java"); doTest(fileName); } @TestMetadata("fieldsWithPrimaryPrivateConstructor.java") public void testFieldsWithPrimaryPrivateConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/fieldsWithPrimaryPrivateConstructor.java"); doTest(fileName); } @TestMetadata("internalEnum.java") public void testInternalEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/internalEnum.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/internalEnum.java"); doTest(fileName); } @TestMetadata("overrideToString.java") public void testOverrideToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/overrideToString.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/overrideToString.java"); doTest(fileName); } @TestMetadata("primaryPrivateConstructor.java") public void testPrimaryPrivateConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/primaryPrivateConstructor.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/primaryPrivateConstructor.java"); doTest(fileName); } @TestMetadata("privateEnum.java") public void testPrivateEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/privateEnum.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/privateEnum.java"); doTest(fileName); } @TestMetadata("protectedEnum.java") public void testProtectedEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/protectedEnum.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/protectedEnum.java"); doTest(fileName); } @TestMetadata("publicEnum.java") public void testPublicEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/publicEnum.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/publicEnum.java"); doTest(fileName); } @TestMetadata("runnableImplementation.java") public void testRunnableImplementation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/runnableImplementation.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/runnableImplementation.java"); doTest(fileName); } @TestMetadata("typeSafeEnum.java") public void testTypeSafeEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/typeSafeEnum.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/typeSafeEnum.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/equals") + @TestMetadata("j2k/tests/testData/fileOrElement/equals") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Equals extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInEquals() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/equals"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/equals"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("Equals1.java") public void testEquals1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/equals/Equals1.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/equals/Equals1.java"); doTest(fileName); } @TestMetadata("Equals2.java") public void testEquals2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/equals/Equals2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/equals/Equals2.java"); doTest(fileName); } @TestMetadata("Equals3.java") public void testEquals3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/equals/Equals3.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/equals/Equals3.java"); doTest(fileName); } @TestMetadata("Equals4.java") public void testEquals4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/equals/Equals4.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/equals/Equals4.java"); doTest(fileName); } @TestMetadata("ObjectsEquals.java") public void testObjectsEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/equals/ObjectsEquals.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/equals/ObjectsEquals.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/field") + @TestMetadata("j2k/tests/testData/fileOrElement/field") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Field extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInField() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/field"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/field"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classChildExtendsBase.java") public void testClassChildExtendsBase() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/classChildExtendsBase.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/classChildExtendsBase.java"); doTest(fileName); } @TestMetadata("conversion.java") public void testConversion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/conversion.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/conversion.java"); doTest(fileName); } @TestMetadata("internalField.java") public void testInternalField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/internalField.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/internalField.java"); doTest(fileName); } @TestMetadata("privateField.java") public void testPrivateField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/privateField.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/privateField.java"); doTest(fileName); } @TestMetadata("protectedField.java") public void testProtectedField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/protectedField.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/protectedField.java"); doTest(fileName); } @TestMetadata("publicField.java") public void testPublicField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/publicField.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/publicField.java"); doTest(fileName); } @TestMetadata("specifyType.java") public void testSpecifyType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/specifyType.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/specifyType.java"); doTest(fileName); } @TestMetadata("valOrVar.java") public void testValOrVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/valOrVar.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/valOrVar.java"); doTest(fileName); } @TestMetadata("valWithInit.java") public void testValWithInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/valWithInit.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/valWithInit.java"); doTest(fileName); } @TestMetadata("varWithInit.java") public void testVarWithInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/varWithInit.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/varWithInit.java"); doTest(fileName); } @TestMetadata("varWithoutInit.java") public void testVarWithoutInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/varWithoutInit.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/varWithoutInit.java"); doTest(fileName); } @TestMetadata("volatileTransientAndStrictFp.java") public void testVolatileTransientAndStrictFp() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/volatileTransientAndStrictFp.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/volatileTransientAndStrictFp.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/for") + @TestMetadata("j2k/tests/testData/fileOrElement/for") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class For extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInFor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/for"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/for"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("commonCaseForTest.java") public void testCommonCaseForTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/commonCaseForTest.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/commonCaseForTest.java"); doTest(fileName); } @TestMetadata("falseForRange.java") public void testFalseForRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/falseForRange.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/falseForRange.java"); doTest(fileName); } @TestMetadata("forRangeWithBlock.java") public void testForRangeWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forRangeWithBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forRangeWithBlock.java"); doTest(fileName); } @TestMetadata("forRangeWithLE.java") public void testForRangeWithLE() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forRangeWithLE.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forRangeWithLE.java"); doTest(fileName); } @TestMetadata("forRangeWithLT.java") public void testForRangeWithLT() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forRangeWithLT.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forRangeWithLT.java"); doTest(fileName); } @TestMetadata("forThroughArrayIndices.java") public void testForThroughArrayIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forThroughArrayIndices.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forThroughArrayIndices.java"); doTest(fileName); } @TestMetadata("forThroughListIndices.java") public void testForThroughListIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forThroughListIndices.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forThroughListIndices.java"); doTest(fileName); } @TestMetadata("forThroughNonArrayIndices.java") public void testForThroughNonArrayIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forThroughNonArrayIndices.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forThroughNonArrayIndices.java"); doTest(fileName); } @TestMetadata("forThroughNonCollectionIndices.java") public void testForThroughNonCollectionIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forThroughNonCollectionIndices.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forThroughNonCollectionIndices.java"); doTest(fileName); } @TestMetadata("forWithBlock.java") public void testForWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forWithBlock.java"); doTest(fileName); } @TestMetadata("forWithBlockAndDoubleUpdate.java") public void testForWithBlockAndDoubleUpdate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forWithBlockAndDoubleUpdate.java"); doTest(fileName); } @TestMetadata("forWithEmptyBlock.java") public void testForWithEmptyBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithEmptyBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forWithEmptyBlock.java"); doTest(fileName); } @TestMetadata("forWithExpression.java") public void testForWithExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithExpression.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forWithExpression.java"); doTest(fileName); } @TestMetadata("forWithNullCondition.java") public void testForWithNullCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithNullCondition.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forWithNullCondition.java"); doTest(fileName); } @TestMetadata("forWithNullInit.java") public void testForWithNullInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithNullInit.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forWithNullInit.java"); doTest(fileName); } @TestMetadata("forWithNullUpdate.java") public void testForWithNullUpdate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithNullUpdate.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forWithNullUpdate.java"); doTest(fileName); } @TestMetadata("forWithReturn.java") public void testForWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithReturn.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forWithReturn.java"); doTest(fileName); } @TestMetadata("infiniteFor.java") public void testInfiniteFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/infiniteFor.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/infiniteFor.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/foreachStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/foreachStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class ForeachStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInForeachStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/foreachStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/foreachStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("enhancedForWithBlock.java") public void testEnhancedForWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithBlock.java"); doTest(fileName); } @TestMetadata("enhancedForWithEmptyBlock.java") public void testEnhancedForWithEmptyBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithEmptyBlock.java"); doTest(fileName); } @TestMetadata("enhancedForWithExpression.java") public void testEnhancedForWithExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithExpression.java"); doTest(fileName); } @TestMetadata("enhancedForWithReturn.java") public void testEnhancedForWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithReturn.java"); doTest(fileName); } @TestMetadata("nullableIterable.java") public void testNullableIterable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/foreachStatement/nullableIterable.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/foreachStatement/nullableIterable.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/formatting") + @TestMetadata("j2k/tests/testData/fileOrElement/formatting") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Formatting extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInFormatting() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/formatting"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/formatting"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("nonStaticMembers.java") public void testNonStaticMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/formatting/nonStaticMembers.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/formatting/nonStaticMembers.java"); doTest(fileName); } @TestMetadata("nonStaticMembersWithComments.java") public void testNonStaticMembersWithComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/formatting/nonStaticMembersWithComments.java"); doTest(fileName); } @TestMetadata("staticAndNonStaticMembersWithComments.java") public void testStaticAndNonStaticMembersWithComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.java"); doTest(fileName); } @TestMetadata("staticMembersWithComments.java") public void testStaticMembersWithComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/formatting/staticMembersWithComments.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/formatting/staticMembersWithComments.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/function") + @TestMetadata("j2k/tests/testData/fileOrElement/function") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Function extends AbstractJavaToKotlinConverterForWebDemoTest { @TestMetadata("abstractMethod.java") public void testAbstractMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/abstractMethod.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/abstractMethod.java"); doTest(fileName); } public void testAllFilesPresentInFunction() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/function"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/function"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classGenericParam.java") public void testClassGenericParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/classGenericParam.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/classGenericParam.java"); doTest(fileName); } @TestMetadata("emptyVoidMethod.java") public void testEmptyVoidMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/emptyVoidMethod.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/emptyVoidMethod.java"); doTest(fileName); } @TestMetadata("extendsBaseWhichExtendsObject.java") public void testExtendsBaseWhichExtendsObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/extendsBaseWhichExtendsObject.java"); doTest(fileName); } @TestMetadata("final.java") public void testFinal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/final.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/final.java"); doTest(fileName); } @TestMetadata("functionInFinalClass.java") public void testFunctionInFinalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/functionInFinalClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/functionInFinalClass.java"); doTest(fileName); } @TestMetadata("internal.java") public void testInternal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/internal.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/internal.java"); doTest(fileName); } @TestMetadata("main.java") public void testMain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/main.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/main.java"); doTest(fileName); } @TestMetadata("main2.java") public void testMain2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/main2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/main2.java"); doTest(fileName); } @TestMetadata("mainAndNullabilitySetting.java") public void testMainAndNullabilitySetting() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/mainAndNullabilitySetting.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/mainAndNullabilitySetting.java"); doTest(fileName); } @TestMetadata("methodClassType.java") public void testMethodClassType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/methodClassType.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/methodClassType.java"); doTest(fileName); } @TestMetadata("methodPrimitiveType.java") public void testMethodPrimitiveType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/methodPrimitiveType.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/methodPrimitiveType.java"); doTest(fileName); } @TestMetadata("methodPrimitiveType2.java") public void testMethodPrimitiveType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/methodPrimitiveType2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/methodPrimitiveType2.java"); doTest(fileName); } @TestMetadata("methodWithReturnStatement.java") public void testMethodWithReturnStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/methodWithReturnStatement.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/methodWithReturnStatement.java"); doTest(fileName); } @TestMetadata("open.java") public void testOpen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/open.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/open.java"); doTest(fileName); } @TestMetadata("override.java") public void testOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/override.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/override.java"); doTest(fileName); } @TestMetadata("overrideAndOpen.java") public void testOverrideAndOpen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/overrideAndOpen.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/overrideAndOpen.java"); doTest(fileName); } @TestMetadata("overrideObject.java") public void testOverrideObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/overrideObject.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/overrideObject.java"); doTest(fileName); } @TestMetadata("overrideObject2.java") public void testOverrideObject2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/overrideObject2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/overrideObject2.java"); doTest(fileName); } @TestMetadata("overrideObject3.java") public void testOverrideObject3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/overrideObject3.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/overrideObject3.java"); doTest(fileName); } @TestMetadata("ownGenericParam.java") public void testOwnGenericParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/ownGenericParam.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/ownGenericParam.java"); doTest(fileName); } @TestMetadata("ownSeveralGenericParams.java") public void testOwnSeveralGenericParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/ownSeveralGenericParams.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/ownSeveralGenericParams.java"); doTest(fileName); } @TestMetadata("parameterModification.java") public void testParameterModification() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/parameterModification.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/parameterModification.java"); doTest(fileName); } @TestMetadata("private.java") public void testPrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/private.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/private.java"); doTest(fileName); } @TestMetadata("protected.java") public void testProtected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/protected.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/protected.java"); doTest(fileName); } @TestMetadata("public.java") public void testPublic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/public.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/public.java"); doTest(fileName); } @TestMetadata("synchronizedMethod.java") public void testSynchronizedMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/synchronizedMethod.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/synchronizedMethod.java"); doTest(fileName); } @TestMetadata("throws.java") public void testThrows() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/throws.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/throws.java"); doTest(fileName); } @TestMetadata("varVararg.java") public void testVarVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/varVararg.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/varVararg.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/identifier") + @TestMetadata("j2k/tests/testData/fileOrElement/identifier") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Identifier extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInIdentifier() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/identifier"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/identifier"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("finalFieldReference.java") public void testFinalFieldReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/identifier/finalFieldReference.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/identifier/finalFieldReference.java"); doTest(fileName); } @TestMetadata("keywords.java") public void testKeywords() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/identifier/keywords.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/identifier/keywords.java"); doTest(fileName); } @TestMetadata("withDollar.java") public void testWithDollar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/identifier/withDollar.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/identifier/withDollar.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/ifStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/ifStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class IfStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInIfStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/ifStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/ifStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("elseIf.java") public void testElseIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/ifStatement/elseIf.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/ifStatement/elseIf.java"); doTest(fileName); } @TestMetadata("multiLine.java") public void testMultiLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/ifStatement/multiLine.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/ifStatement/multiLine.java"); doTest(fileName); } @TestMetadata("singleLine.java") public void testSingleLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/ifStatement/singleLine.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/ifStatement/singleLine.java"); doTest(fileName); } @TestMetadata("withBlocks.java") public void testWithBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/ifStatement/withBlocks.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/ifStatement/withBlocks.java"); doTest(fileName); } @TestMetadata("withEmptyBlocks.java") public void testWithEmptyBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/ifStatement/withEmptyBlocks.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/ifStatement/withEmptyBlocks.java"); doTest(fileName); } @TestMetadata("withoutElse.java") public void testWithoutElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/ifStatement/withoutElse.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/ifStatement/withoutElse.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/importStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/importStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class ImportStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInImportStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/importStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/importStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("importWithKeywords.java") public void testImportWithKeywords() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/importStatement/importWithKeywords.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/importStatement/importWithKeywords.java"); doTest(fileName); } @TestMetadata("importWithStar.java") public void testImportWithStar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/importStatement/importWithStar.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/importStatement/importWithStar.java"); doTest(fileName); } @TestMetadata("oneImport.java") public void testOneImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/importStatement/oneImport.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/importStatement/oneImport.java"); doTest(fileName); } @TestMetadata("onlyImports.java") public void testOnlyImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/importStatement/onlyImports.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/importStatement/onlyImports.java"); doTest(fileName); } @TestMetadata("simpleImport.java") public void testSimpleImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/importStatement/simpleImport.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/importStatement/simpleImport.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/inProjectionType") + @TestMetadata("j2k/tests/testData/fileOrElement/inProjectionType") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class InProjectionType extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInInProjectionType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/inProjectionType"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/inProjectionType"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("methodParams.java") public void testMethodParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/inProjectionType/methodParams.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/inProjectionType/methodParams.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/inheritance") + @TestMetadata("j2k/tests/testData/fileOrElement/inheritance") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Inheritance extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInInheritance() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/inheritance"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/inheritance"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classOneExtendsBaseGeneric.java") public void testClassOneExtendsBaseGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseGeneric.java"); doTest(fileName); } @TestMetadata("classOneExtendsBaseWithOneParam.java") public void testClassOneExtendsBaseWithOneParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseWithOneParam.java"); doTest(fileName); } @TestMetadata("classOneExtendsBaseWithZeroParams.java") public void testClassOneExtendsBaseWithZeroParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParams.java"); doTest(fileName); } @TestMetadata("classOneExtendsBaseWithZeroParamsNonEmptyConstructor.java") public void testClassOneExtendsBaseWithZeroParamsNonEmptyConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/isOperator") + @TestMetadata("j2k/tests/testData/fileOrElement/isOperator") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class IsOperator extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInIsOperator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/isOperator"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/isOperator"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("complicatedExpression.java") public void testComplicatedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/isOperator/complicatedExpression.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/isOperator/complicatedExpression.java"); doTest(fileName); } @TestMetadata("simpleReference.java") public void testSimpleReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/isOperator/simpleReference.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/isOperator/simpleReference.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/issues") + @TestMetadata("j2k/tests/testData/fileOrElement/issues") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Issues extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInIssues() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/issues"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/issues"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("arrayLength.java") public void testArrayLength() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/arrayLength.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/arrayLength.java"); doTest(fileName); } @TestMetadata("comments.java") public void testComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/comments.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/comments.java"); doTest(fileName); } @TestMetadata("doNotQualifyStatic.java") public void testDoNotQualifyStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/doNotQualifyStatic.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/doNotQualifyStatic.java"); doTest(fileName); } @TestMetadata("kt-1016.java") public void testKt_1016() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-1016.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-1016.java"); doTest(fileName); } @TestMetadata("kt-1048.java") public void testKt_1048() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-1048.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-1048.java"); doTest(fileName); } @TestMetadata("kt-1074.java") public void testKt_1074() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-1074.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-1074.java"); doTest(fileName); } @TestMetadata("kt-5294.java") public void testKt_5294() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-5294.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-5294.java"); doTest(fileName); } @TestMetadata("kt-5400.java") public void testKt_5400() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-5400.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-5400.java"); doTest(fileName); } @TestMetadata("kt-543.java") public void testKt_543() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-543.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-543.java"); doTest(fileName); } @TestMetadata("kt-543-boxed.java") public void testKt_543_boxed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-543-boxed.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-543-boxed.java"); doTest(fileName); } @TestMetadata("kt-543-mixed.java") public void testKt_543_mixed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-543-mixed.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-543-mixed.java"); doTest(fileName); } @TestMetadata("kt-638.java") public void testKt_638() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-638.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-638.java"); doTest(fileName); } @TestMetadata("kt-696.java") public void testKt_696() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-696.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-696.java"); doTest(fileName); } @TestMetadata("kt-792.java") public void testKt_792() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-792.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-792.java"); doTest(fileName); } @TestMetadata("kt-792-mixed.java") public void testKt_792_mixed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-792-mixed.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-792-mixed.java"); doTest(fileName); } @TestMetadata("kt-794.java") public void testKt_794() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-794.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-794.java"); doTest(fileName); } @TestMetadata("kt-794-mixed.java") public void testKt_794_mixed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-794-mixed.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-794-mixed.java"); doTest(fileName); } @TestMetadata("kt-807.java") public void testKt_807() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-807.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-807.java"); doTest(fileName); } @TestMetadata("kt-809.java") public void testKt_809() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-809.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-809.java"); doTest(fileName); } @TestMetadata("kt-809-string.java") public void testKt_809_string() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-809-string.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-809-string.java"); doTest(fileName); } @TestMetadata("kt-820.java") public void testKt_820() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-820.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-820.java"); doTest(fileName); } @TestMetadata("kt-820-field.java") public void testKt_820_field() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-820-field.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-820-field.java"); doTest(fileName); } @TestMetadata("kt-820-string.java") public void testKt_820_string() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-820-string.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-820-string.java"); doTest(fileName); } @TestMetadata("kt-824.java") public void testKt_824() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-824.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-824.java"); doTest(fileName); } @TestMetadata("kt-824-isDir.java") public void testKt_824_isDir() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-824-isDir.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-824-isDir.java"); doTest(fileName); } @TestMetadata("kt-828.java") public void testKt_828() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-828.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-828.java"); doTest(fileName); } @TestMetadata("kt-836.java") public void testKt_836() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-836.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-836.java"); doTest(fileName); } @TestMetadata("kt-837.java") public void testKt_837() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-837.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-837.java"); doTest(fileName); } @TestMetadata("kt-851.java") public void testKt_851() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-851.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-851.java"); doTest(fileName); } @TestMetadata("kt-852.java") public void testKt_852() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-852.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-852.java"); doTest(fileName); } @TestMetadata("kt-871.java") public void testKt_871() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-871.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-871.java"); doTest(fileName); } @TestMetadata("kt-879.java") public void testKt_879() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-879.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-879.java"); doTest(fileName); } @TestMetadata("kt-893.java") public void testKt_893() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-893.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-893.java"); doTest(fileName); } @TestMetadata("kt-899.java") public void testKt_899() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-899.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-899.java"); doTest(fileName); } @TestMetadata("kt-963.java") public void testKt_963() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-963.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-963.java"); doTest(fileName); } @TestMetadata("qualifyStatic.java") public void testQualifyStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/qualifyStatic.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/qualifyStatic.java"); doTest(fileName); } @TestMetadata("spaceBeforeAssignment.java") public void testSpaceBeforeAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/spaceBeforeAssignment.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/spaceBeforeAssignment.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/kotlinApiAccess") + @TestMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class KotlinApiAccess extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInKotlinApiAccess() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/kotlinApiAccess"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/kotlinApiAccess"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ClassObjectMembers.java") public void testClassObjectMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/ClassObjectMembers.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.java"); doTest(fileName); } @TestMetadata("CorrectFunNullabilityDetected.java") public void testCorrectFunNullabilityDetected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/CorrectFunNullabilityDetected.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/CorrectFunNullabilityDetected.java"); doTest(fileName); } @TestMetadata("CorrectNullabilityDetected.java") public void testCorrectNullabilityDetected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/CorrectNullabilityDetected.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.java"); doTest(fileName); } @TestMetadata("ExtensionFunction.java") public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/ExtensionFunction.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/ExtensionFunction.java"); doTest(fileName); } @TestMetadata("ExtensionProperty.java") public void testExtensionProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/ExtensionProperty.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/ExtensionProperty.java"); doTest(fileName); } @TestMetadata("GlobalFunction.java") public void testGlobalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/GlobalFunction.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalFunction.java"); doTest(fileName); } @TestMetadata("GlobalGenericFunction.java") public void testGlobalGenericFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/GlobalGenericFunction.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalGenericFunction.java"); doTest(fileName); } @TestMetadata("GlobalValue1.java") public void testGlobalValue1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/GlobalValue1.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalValue1.java"); doTest(fileName); } @TestMetadata("GlobalValue2.java") public void testGlobalValue2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/GlobalValue2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalValue2.java"); doTest(fileName); } @TestMetadata("InheritedProperty.java") public void testInheritedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/InheritedProperty.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/InheritedProperty.java"); doTest(fileName); } @TestMetadata("ObjectMembers.java") public void testObjectMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/ObjectMembers.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/ObjectMembers.java"); doTest(fileName); } @TestMetadata("Property.java") public void testProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/Property.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/Property.java"); doTest(fileName); } @TestMetadata("Property2.java") public void testProperty2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/Property2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/Property2.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/labelStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/labelStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class LabelStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInLabelStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/labelStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/labelStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("complicatedExampleFromJavaTutorial.java") public void testComplicatedExampleFromJavaTutorial() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/labelStatement/complicatedExampleFromJavaTutorial.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/list") + @TestMetadata("j2k/tests/testData/fileOrElement/list") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class List extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInList() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/list"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/list"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ForEach.java") public void testForEach() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/list/ForEach.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/list/ForEach.java"); doTest(fileName); } @TestMetadata("Lists.java") public void testLists() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/list/Lists.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/list/Lists.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/literalExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/literalExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class LiteralExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInLiteralExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/literalExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/literalExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("char.java") public void testChar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/literalExpression/char.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/literalExpression/char.java"); doTest(fileName); } @TestMetadata("dollarInsideString.java") public void testDollarInsideString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/literalExpression/dollarInsideString.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/literalExpression/dollarInsideString.java"); doTest(fileName); } @TestMetadata("endsWithDFL.java") public void testEndsWithDFL() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/literalExpression/endsWithDFL.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/literalExpression/endsWithDFL.java"); doTest(fileName); } @TestMetadata("hex.java") public void testHex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/literalExpression/hex.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/literalExpression/hex.java"); doTest(fileName); } @TestMetadata("octal.java") public void testOctal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/literalExpression/octal.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/literalExpression/octal.java"); doTest(fileName); } @TestMetadata("trueOrFalse.java") public void testTrueOrFalse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/literalExpression/trueOrFalse.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/literalExpression/trueOrFalse.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/localVariable") + @TestMetadata("j2k/tests/testData/fileOrElement/localVariable") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class LocalVariable extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInLocalVariable() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/localVariable"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/localVariable"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("autoBangBang.java") public void testAutoBangBang() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/autoBangBang.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/localVariable/autoBangBang.java"); doTest(fileName); } @TestMetadata("conversion.java") public void testConversion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/conversion.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/localVariable/conversion.java"); doTest(fileName); } @TestMetadata("literalConversion.java") public void testLiteralConversion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/literalConversion.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/localVariable/literalConversion.java"); doTest(fileName); } @TestMetadata("nullIInitializer.java") public void testNullIInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/nullIInitializer.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/localVariable/nullIInitializer.java"); doTest(fileName); } @TestMetadata("object.java") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/object.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/localVariable/object.java"); doTest(fileName); } @TestMetadata("unboxing.java") public void testUnboxing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/unboxing.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/localVariable/unboxing.java"); doTest(fileName); } @TestMetadata("valTypeDoNotMatch.java") public void testValTypeDoNotMatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/valTypeDoNotMatch.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/localVariable/valTypeDoNotMatch.java"); doTest(fileName); } @TestMetadata("varTypeDoNotMatch.java") public void testVarTypeDoNotMatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/varTypeDoNotMatch.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/localVariable/varTypeDoNotMatch.java"); doTest(fileName); } @TestMetadata("varWithNoInitializer.java") public void testVarWithNoInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/varWithNoInitializer.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/localVariable/varWithNoInitializer.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/methodCallExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/methodCallExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class MethodCallExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInMethodCallExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/methodCallExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/methodCallExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("callWithKeywords.java") public void testCallWithKeywords() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/callWithKeywords.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/methodCallExpression/callWithKeywords.java"); doTest(fileName); } @TestMetadata("collectionsMethods.java") public void testCollectionsMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/collectionsMethods.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/methodCallExpression/collectionsMethods.java"); doTest(fileName); } @TestMetadata("collectionsMethods2.java") public void testCollectionsMethods2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/collectionsMethods2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/methodCallExpression/collectionsMethods2.java"); doTest(fileName); } @TestMetadata("emptyCall.java") public void testEmptyCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/emptyCall.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/methodCallExpression/emptyCall.java"); doTest(fileName); } @TestMetadata("genericMethod.java") public void testGenericMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/genericMethod.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/methodCallExpression/genericMethod.java"); doTest(fileName); } @TestMetadata("getClass.java") public void testGetClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/getClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/methodCallExpression/getClass.java"); doTest(fileName); } @TestMetadata("simpleCall.java") public void testSimpleCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/simpleCall.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/methodCallExpression/simpleCall.java"); doTest(fileName); } @TestMetadata("vararg1.java") public void testVararg1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/vararg1.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/methodCallExpression/vararg1.java"); doTest(fileName); } @TestMetadata("vararg2.java") public void testVararg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/vararg2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/methodCallExpression/vararg2.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/misc") + @TestMetadata("j2k/tests/testData/fileOrElement/misc") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Misc extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInMisc() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/misc"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/misc"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("packageWithClass.java") public void testPackageWithClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/misc/packageWithClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/misc/packageWithClass.java"); doTest(fileName); } @TestMetadata("packageWithClasses.java") public void testPackageWithClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/misc/packageWithClasses.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/misc/packageWithClasses.java"); doTest(fileName); } @TestMetadata("packageWithImports.java") public void testPackageWithImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/misc/packageWithImports.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/misc/packageWithImports.java"); doTest(fileName); } @TestMetadata("packageWithMixedImports.java") public void testPackageWithMixedImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/misc/packageWithMixedImports.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/misc/packageWithMixedImports.java"); doTest(fileName); } @TestMetadata("packageWithOpenClass.java") public void testPackageWithOpenClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/misc/packageWithOpenClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/misc/packageWithOpenClass.java"); doTest(fileName); } @TestMetadata("packageWithStaticImports.java") public void testPackageWithStaticImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/misc/packageWithStaticImports.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/misc/packageWithStaticImports.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/newClassExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/newClassExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class NewClassExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInNewClassExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/newClassExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/newClassExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classWithParam.java") public void testClassWithParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/classWithParam.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/classWithParam.java"); doTest(fileName); } @TestMetadata("classWithParams.java") public void testClassWithParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/classWithParams.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/classWithParams.java"); doTest(fileName); } @TestMetadata("classWithoutBody.java") public void testClassWithoutBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/classWithoutBody.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/classWithoutBody.java"); doTest(fileName); } @TestMetadata("fullQualifiedName.java") public void testFullQualifiedName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/fullQualifiedName.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/fullQualifiedName.java"); doTest(fileName); } @TestMetadata("fullQualifiedName2.java") public void testFullQualifiedName2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/fullQualifiedName2.java"); doTest(fileName); } @TestMetadata("genericClassInvocation.java") public void testGenericClassInvocation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/genericClassInvocation.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/genericClassInvocation.java"); doTest(fileName); } @TestMetadata("newAnonymousClass.java") public void testNewAnonymousClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/newAnonymousClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/newAnonymousClass.java"); doTest(fileName); } @TestMetadata("newAnonymousClass2.java") public void testNewAnonymousClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/newAnonymousClass2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/newAnonymousClass2.java"); doTest(fileName); } @TestMetadata("newAnonymousClass3.java") public void testNewAnonymousClass3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/newAnonymousClass3.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/newAnonymousClass3.java"); doTest(fileName); } @TestMetadata("newClassByFullName.java") public void testNewClassByFullName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/newClassByFullName.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/newClassByFullName.java"); doTest(fileName); } @TestMetadata("newInnerClass.java") public void testNewInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/newInnerClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/newInnerClass.java"); doTest(fileName); } @TestMetadata("newListAndNewMember.java") public void testNewListAndNewMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/newListAndNewMember.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/newListAndNewMember.java"); doTest(fileName); } @TestMetadata("newStaticInnerClass.java") public void testNewStaticInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/newStaticInnerClass.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/nullability") + @TestMetadata("j2k/tests/testData/fileOrElement/nullability") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Nullability extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInNullability() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/nullability"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/nullability"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("autoNotNull.java") public void testAutoNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/autoNotNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/autoNotNull.java"); doTest(fileName); } @TestMetadata("FieldAssignedWithNull.java") public void testFieldAssignedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/FieldAssignedWithNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/FieldAssignedWithNull.java"); doTest(fileName); } @TestMetadata("FieldComparedWithNull.java") public void testFieldComparedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/FieldComparedWithNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull.java"); doTest(fileName); } @TestMetadata("FieldComparedWithNull2.java") public void testFieldComparedWithNull2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/FieldComparedWithNull2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull2.java"); doTest(fileName); } @TestMetadata("FieldComparedWithNull3.java") public void testFieldComparedWithNull3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/FieldComparedWithNull3.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull3.java"); doTest(fileName); } @TestMetadata("FieldComparedWithNull4.java") public void testFieldComparedWithNull4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/FieldComparedWithNull4.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull4.java"); doTest(fileName); } @TestMetadata("FieldInitializedWithNull.java") public void testFieldInitializedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/FieldInitializedWithNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/FieldInitializedWithNull.java"); doTest(fileName); } @TestMetadata("IndirectOverride.java") public void testIndirectOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/IndirectOverride.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/IndirectOverride.java"); doTest(fileName); } @TestMetadata("MethodInvokedWithNullArg.java") public void testMethodInvokedWithNullArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodInvokedWithNullArg.java"); doTest(fileName); } @TestMetadata("MethodInvokedWithNullArg2.java") public void testMethodInvokedWithNullArg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.java"); doTest(fileName); } @TestMetadata("MethodInvokedWithTernaryNullArg.java") public void testMethodInvokedWithTernaryNullArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodInvokedWithTernaryNullArg.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.java"); doTest(fileName); } @TestMetadata("MethodResultComparedWithNull.java") public void testMethodResultComparedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodResultComparedWithNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull.java"); doTest(fileName); } @TestMetadata("MethodResultComparedWithNull2.java") public void testMethodResultComparedWithNull2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodResultComparedWithNull2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull2.java"); doTest(fileName); } @TestMetadata("MethodResultComparedWithNull3.java") public void testMethodResultComparedWithNull3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodResultComparedWithNull3.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull3.java"); doTest(fileName); } @TestMetadata("MethodResultComparedWithNull4.java") public void testMethodResultComparedWithNull4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodResultComparedWithNull4.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull4.java"); doTest(fileName); } @TestMetadata("MethodResultInitializesNullableField.java") public void testMethodResultInitializesNullableField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodResultInitializesNullableField.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodResultInitializesNullableField.java"); doTest(fileName); } @TestMetadata("MethodReturnsNull.java") public void testMethodReturnsNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodReturnsNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodReturnsNull.java"); doTest(fileName); } @TestMetadata("MethodReturnsNullInAnonymousClass.java") public void testMethodReturnsNullInAnonymousClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodReturnsNullInAnonymousClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.java"); doTest(fileName); } @TestMetadata("MethodReturnsNullInLocalClass.java") public void testMethodReturnsNullInLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodReturnsNullInLocalClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodReturnsNullInLocalClass.java"); doTest(fileName); } @TestMetadata("MethodReturnsTernaryNull.java") public void testMethodReturnsTernaryNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodReturnsTernaryNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodReturnsTernaryNull.java"); doTest(fileName); } @TestMetadata("NullableIntNoCrash.java") public void testNullableIntNoCrash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/NullableIntNoCrash.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/NullableIntNoCrash.java"); doTest(fileName); } @TestMetadata("NullableMethodDotAccess.java") public void testNullableMethodDotAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/NullableMethodDotAccess.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/NullableMethodDotAccess.java"); doTest(fileName); } @TestMetadata("NullableVariableDotAccess.java") public void testNullableVariableDotAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/NullableVariableDotAccess.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/NullableVariableDotAccess.java"); doTest(fileName); } @TestMetadata("OverrideWithInheritanceLoop.java") public void testOverrideWithInheritanceLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/OverrideWithInheritanceLoop.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/OverrideWithInheritanceLoop.java"); doTest(fileName); } @TestMetadata("Overrides.java") public void testOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/Overrides.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/Overrides.java"); doTest(fileName); } @TestMetadata("ParameterComparedWithNull.java") public void testParameterComparedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/ParameterComparedWithNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/ParameterComparedWithNull.java"); doTest(fileName); } @TestMetadata("VariableAssignedWithNull.java") public void testVariableAssignedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/VariableAssignedWithNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/VariableAssignedWithNull.java"); doTest(fileName); } @TestMetadata("VariableComparedWithNull.java") public void testVariableComparedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/VariableComparedWithNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/VariableComparedWithNull.java"); doTest(fileName); } @TestMetadata("VariableInitializedWithNull.java") public void testVariableInitializedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/VariableInitializedWithNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/VariableInitializedWithNull.java"); doTest(fileName); } @TestMetadata("VariableInitializedWithTernaryNull.java") public void testVariableInitializedWithTernaryNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/VariableInitializedWithTernaryNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/objectLiteral") + @TestMetadata("j2k/tests/testData/fileOrElement/objectLiteral") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class ObjectLiteral extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInObjectLiteral() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/objectLiteral"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/objectLiteral"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("MyFrame.java") public void testMyFrame() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/objectLiteral/MyFrame.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/objectLiteral/MyFrame.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/outProjectionType") + @TestMetadata("j2k/tests/testData/fileOrElement/outProjectionType") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class OutProjectionType extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInOutProjectionType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/outProjectionType"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/outProjectionType"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("methodParams.java") public void testMethodParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/outProjectionType/methodParams.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/outProjectionType/methodParams.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/packageStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/packageStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class PackageStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInPackageStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/packageStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/packageStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("orgJetbrainsJetJ2kIn.java") public void testOrgJetbrainsJetJ2kIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/packageStatement/orgJetbrainsJetJ2kIn.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/parenthesizedExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/parenthesizedExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class ParenthesizedExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInParenthesizedExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/parenthesizedExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/parenthesizedExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("parenthesized.java") public void testParenthesized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/parenthesizedExpression/parenthesized.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/parenthesizedExpression/parenthesized.java"); doTest(fileName); } @TestMetadata("parenthesized2.java") public void testParenthesized2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/parenthesizedExpression/parenthesized2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/parenthesizedExpression/parenthesized2.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/polyadicExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/polyadicExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class PolyadicExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInPolyadicExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/polyadicExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/polyadicExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("divide.java") public void testDivide() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/polyadicExpression/divide.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/polyadicExpression/divide.java"); doTest(fileName); } @TestMetadata("minus.java") public void testMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/polyadicExpression/minus.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/polyadicExpression/minus.java"); doTest(fileName); } @TestMetadata("multiply.java") public void testMultiply() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/polyadicExpression/multiply.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/polyadicExpression/multiply.java"); doTest(fileName); } @TestMetadata("plus.java") public void testPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/polyadicExpression/plus.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/polyadicExpression/plus.java"); doTest(fileName); } @TestMetadata("remainder.java") public void testRemainder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/polyadicExpression/remainder.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/polyadicExpression/remainder.java"); doTest(fileName); } @TestMetadata("unassignedShiftRight.java") public void testUnassignedShiftRight() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/polyadicExpression/unassignedShiftRight.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/polyadicExpression/unassignedShiftRight.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/postfixOperator") + @TestMetadata("j2k/tests/testData/fileOrElement/postfixOperator") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class PostfixOperator extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInPostfixOperator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/postfixOperator"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/postfixOperator"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("decrement.java") public void testDecrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/postfixOperator/decrement.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/postfixOperator/decrement.java"); doTest(fileName); } @TestMetadata("increment.java") public void testIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/postfixOperator/increment.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/postfixOperator/increment.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/prefixOperator") + @TestMetadata("j2k/tests/testData/fileOrElement/prefixOperator") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class PrefixOperator extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInPrefixOperator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/prefixOperator"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/prefixOperator"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("decrement.java") public void testDecrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/prefixOperator/decrement.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/prefixOperator/decrement.java"); doTest(fileName); } @TestMetadata("excl.java") public void testExcl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/prefixOperator/excl.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/prefixOperator/excl.java"); doTest(fileName); } @TestMetadata("increment.java") public void testIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/prefixOperator/increment.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/prefixOperator/increment.java"); doTest(fileName); } @TestMetadata("kt-667.java") public void testKt_667() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/prefixOperator/kt-667.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/prefixOperator/kt-667.java"); doTest(fileName); } @TestMetadata("nullableIf.java") public void testNullableIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/prefixOperator/nullableIf.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/prefixOperator/nullableIf.java"); doTest(fileName); } @TestMetadata("tilde.java") public void testTilde() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/prefixOperator/tilde.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/prefixOperator/tilde.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/rawGenerics") + @TestMetadata("j2k/tests/testData/fileOrElement/rawGenerics") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class RawGenerics extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInRawGenerics() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/rawGenerics"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/rawGenerics"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("kt-540.java") public void testKt_540() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/rawGenerics/kt-540.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/rawGenerics/kt-540.java"); doTest(fileName); } @TestMetadata("kt-540-map.java") public void testKt_540_map() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/rawGenerics/kt-540-map.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/rawGenerics/kt-540-map.java"); doTest(fileName); } @TestMetadata("kt-540-rawGenericClass.java") public void testKt_540_rawGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.java"); doTest(fileName); } @TestMetadata("rawGenericMethod.java") public void testRawGenericMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/rawGenerics/rawGenericMethod.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/rawGenerics/rawGenericMethod.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/returnStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/returnStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class ReturnStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInReturnStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/returnStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/returnStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("currentMethodBug.java") public void testCurrentMethodBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/returnStatement/currentMethodBug.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/returnStatement/currentMethodBug.java"); doTest(fileName); } @TestMetadata("returnChar.java") public void testReturnChar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/returnStatement/returnChar.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/returnStatement/returnChar.java"); doTest(fileName); } @TestMetadata("returnLiteral.java") public void testReturnLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/returnStatement/returnLiteral.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/returnStatement/returnLiteral.java"); doTest(fileName); } @TestMetadata("returnNumber.java") public void testReturnNumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/returnStatement/returnNumber.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/returnStatement/returnNumber.java"); doTest(fileName); } @TestMetadata("returnString.java") public void testReturnString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/returnStatement/returnString.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/returnStatement/returnString.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/settings") + @TestMetadata("j2k/tests/testData/fileOrElement/settings") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Settings extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInSettings() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/settings"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/settings"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("openByDefault.java") public void testOpenByDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/settings/openByDefault.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/settings/openByDefault.java"); doTest(fileName); } @TestMetadata("specifyFieldTypeByDefault.java") public void testSpecifyFieldTypeByDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/settings/specifyFieldTypeByDefault.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/settings/specifyFieldTypeByDefault.java"); doTest(fileName); } @TestMetadata("specifyLocalVariableTypeByDefault.java") public void testSpecifyLocalVariableTypeByDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/settings/specifyLocalVariableTypeByDefault.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.java"); doTest(fileName); } @TestMetadata("specifyLocalVariableTypeByDefaultInFor.java") public void testSpecifyLocalVariableTypeByDefaultInFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/settings/specifyLocalVariableTypeByDefaultInFor.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/starProjectionType") + @TestMetadata("j2k/tests/testData/fileOrElement/starProjectionType") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class StarProjectionType extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInStarProjectionType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/starProjectionType"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/starProjectionType"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("methodParams.java") public void testMethodParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/starProjectionType/methodParams.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/starProjectionType/methodParams.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/staticMembers") + @TestMetadata("j2k/tests/testData/fileOrElement/staticMembers") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class StaticMembers extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInStaticMembers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/staticMembers"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/staticMembers"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("PrivateStaticMembers.java") public void testPrivateStaticMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/staticMembers/PrivateStaticMembers.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMembers.java"); doTest(fileName); } @TestMetadata("PrivateStaticMethods1.java") public void testPrivateStaticMethods1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/staticMembers/PrivateStaticMethods1.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods1.java"); doTest(fileName); } @TestMetadata("PrivateStaticMethods2.java") public void testPrivateStaticMethods2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/staticMembers/PrivateStaticMethods2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods2.java"); doTest(fileName); } @TestMetadata("PrivateStaticMethods3.java") public void testPrivateStaticMethods3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/staticMembers/PrivateStaticMethods3.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods3.java"); doTest(fileName); } @TestMetadata("PrivateStaticMethods4.java") public void testPrivateStaticMethods4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/staticMembers/PrivateStaticMethods4.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods4.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/superExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/superExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class SuperExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInSuperExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/superExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/superExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classAdotSuperFoo.java") public void testClassAdotSuperFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/superExpression/classAdotSuperFoo.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/superExpression/classAdotSuperFoo.java"); doTest(fileName); } @TestMetadata("classAextendsB.java") public void testClassAextendsB() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/superExpression/classAextendsB.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/superExpression/classAextendsB.java"); doTest(fileName); } @TestMetadata("superStatement.java") public void testSuperStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/superExpression/superStatement.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/superExpression/superStatement.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/switch") + @TestMetadata("j2k/tests/testData/fileOrElement/switch") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Switch extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInSwitch() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/switch"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/switch"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("caseWithBlock.java") public void testCaseWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/caseWithBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/switch/caseWithBlock.java"); doTest(fileName); } @TestMetadata("comlicatedFallDown.java") public void testComlicatedFallDown() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/comlicatedFallDown.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/switch/comlicatedFallDown.java"); doTest(fileName); } @TestMetadata("continueAndBreakWithLabel.java") public void testContinueAndBreakWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/continueAndBreakWithLabel.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/switch/continueAndBreakWithLabel.java"); doTest(fileName); } @TestMetadata("emptySwitch.java") public void testEmptySwitch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/emptySwitch.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/switch/emptySwitch.java"); doTest(fileName); } @TestMetadata("enumConstants.java") public void testEnumConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/enumConstants.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/switch/enumConstants.java"); doTest(fileName); } @TestMetadata("fallDown.java") public void testFallDown() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/fallDown.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/switch/fallDown.java"); doTest(fileName); } @TestMetadata("fallDownWithBlocks.java") public void testFallDownWithBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/fallDownWithBlocks.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/switch/fallDownWithBlocks.java"); doTest(fileName); } @TestMetadata("invalidSwitch.java") public void testInvalidSwitch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/invalidSwitch.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/switch/invalidSwitch.java"); doTest(fileName); } @TestMetadata("kt-539.java") public void testKt_539() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/kt-539.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/switch/kt-539.java"); doTest(fileName); } @TestMetadata("nondefault.java") public void testNondefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/nondefault.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/switch/nondefault.java"); doTest(fileName); } @TestMetadata("returnsAndThrows.java") public void testReturnsAndThrows() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/returnsAndThrows.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/switch/returnsAndThrows.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/synchronizedStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/synchronizedStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class SynchronizedStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInSynchronizedStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/synchronizedStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/synchronizedStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("singleLineExample.java") public void testSingleLineExample() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/synchronizedStatement/singleLineExample.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/synchronizedStatement/singleLineExample.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/thisExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/thisExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class ThisExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInThisExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/thisExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/thisExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classAdotThisFoo.java") public void testClassAdotThisFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/thisExpression/classAdotThisFoo.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/thisExpression/classAdotThisFoo.java"); doTest(fileName); } @TestMetadata("thisStatement.java") public void testThisStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/thisExpression/thisStatement.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/thisExpression/thisStatement.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/throwStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/throwStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class ThrowStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInThrowStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/throwStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/throwStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("simpleThrowStatement.java") public void testSimpleThrowStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/throwStatement/simpleThrowStatement.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/throwStatement/simpleThrowStatement.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/toKotlinClasses") + @TestMetadata("j2k/tests/testData/fileOrElement/toKotlinClasses") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class ToKotlinClasses extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInToKotlinClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/toKotlinClasses"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/toKotlinClasses"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("iterableAndIterator.java") public void testIterableAndIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/toKotlinClasses/iterableAndIterator.java"); doTest(fileName); } @TestMetadata("iterableAndIterator2.java") public void testIterableAndIterator2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.java"); doTest(fileName); } @TestMetadata("iterableAndIterator3.java") public void testIterableAndIterator3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator3.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.java"); doTest(fileName); } @TestMetadata("TypeParameterBound.java") public void testTypeParameterBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/toKotlinClasses/TypeParameterBound.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/toKotlinClasses/TypeParameterBound.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/trait") + @TestMetadata("j2k/tests/testData/fileOrElement/trait") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Trait extends AbstractJavaToKotlinConverterForWebDemoTest { @TestMetadata("abstactInterface.java") public void testAbstactInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/abstactInterface.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/trait/abstactInterface.java"); doTest(fileName); } public void testAllFilesPresentInTrait() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/trait"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/trait"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("emptyInterface.java") public void testEmptyInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/emptyInterface.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/trait/emptyInterface.java"); doTest(fileName); } @TestMetadata("extendsOneClassAndImplementsSeveralInterfaces.java") public void testExtendsOneClassAndImplementsSeveralInterfaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/trait/extendsOneClassAndImplementsSeveralInterfaces.java"); doTest(fileName); } @TestMetadata("extendsOneInterface.java") public void testExtendsOneInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/extendsOneInterface.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/trait/extendsOneInterface.java"); doTest(fileName); } @TestMetadata("interfaceWithFields.java") public void testInterfaceWithFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/interfaceWithFields.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/trait/interfaceWithFields.java"); doTest(fileName); } @TestMetadata("interfaceWithMethodDeclaration.java") public void testInterfaceWithMethodDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/trait/interfaceWithMethodDeclaration.java"); doTest(fileName); } @TestMetadata("interfaceWithStaticFields.java") public void testInterfaceWithStaticFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/interfaceWithStaticFields.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/trait/interfaceWithStaticFields.java"); doTest(fileName); } @TestMetadata("internalInterface.java") public void testInternalInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/internalInterface.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/trait/internalInterface.java"); doTest(fileName); } @TestMetadata("privateInterface.java") public void testPrivateInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/privateInterface.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/trait/privateInterface.java"); doTest(fileName); } @TestMetadata("protectedInterface.java") public void testProtectedInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/protectedInterface.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/trait/protectedInterface.java"); doTest(fileName); } @TestMetadata("publicInterface.java") public void testPublicInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/publicInterface.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/trait/publicInterface.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/tryStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/tryStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class TryStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInTryStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/tryStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/tryStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("commonCaseForTryStatement.java") public void testCommonCaseForTryStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryStatement/commonCaseForTryStatement.java"); doTest(fileName); } @TestMetadata("disjunctionType.java") public void testDisjunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryStatement/disjunctionType.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryStatement/disjunctionType.java"); doTest(fileName); } @TestMetadata("emptyTryWithTwoCatchesWithEmptyFinally.java") public void testEmptyTryWithTwoCatchesWithEmptyFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.java"); doTest(fileName); } @TestMetadata("emptyTryWithTwoCatchesWithFinally.java") public void testEmptyTryWithTwoCatchesWithFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithFinally.java"); doTest(fileName); } @TestMetadata("emptyTryWithTwoCatchesWithoutFinally.java") public void testEmptyTryWithTwoCatchesWithoutFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithoutFinally.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/tryWithResource") + @TestMetadata("j2k/tests/testData/fileOrElement/tryWithResource") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class TryWithResource extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInTryWithResource() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/tryWithResource"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/tryWithResource"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("Multiline.java") public void testMultiline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/Multiline.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryWithResource/Multiline.java"); doTest(fileName); } @TestMetadata("MultipleResources.java") public void testMultipleResources() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/MultipleResources.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryWithResource/MultipleResources.java"); doTest(fileName); } @TestMetadata("Simple.java") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/Simple.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryWithResource/Simple.java"); doTest(fileName); } @TestMetadata("WithCatch.java") public void testWithCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/WithCatch.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryWithResource/WithCatch.java"); doTest(fileName); } @TestMetadata("WithCatchAndFinally.java") public void testWithCatchAndFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/WithCatchAndFinally.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryWithResource/WithCatchAndFinally.java"); doTest(fileName); } @TestMetadata("WithCatches.java") public void testWithCatches() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/WithCatches.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryWithResource/WithCatches.java"); doTest(fileName); } @TestMetadata("WithFinally.java") public void testWithFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/WithFinally.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryWithResource/WithFinally.java"); doTest(fileName); } @TestMetadata("WithReturnAtEnd.java") public void testWithReturnAtEnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/WithReturnAtEnd.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryWithResource/WithReturnAtEnd.java"); doTest(fileName); } @TestMetadata("WithReturnInAnonymousClass.java") public void testWithReturnInAnonymousClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass.java"); doTest(fileName); } @TestMetadata("WithReturnInAnonymousClass2.java") public void testWithReturnInAnonymousClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass2.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/typeCastExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/typeCastExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class TypeCastExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInTypeCastExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/typeCastExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/typeCastExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("extendsWildcardCast.java") public void testExtendsWildcardCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeCastExpression/extendsWildcardCast.java"); doTest(fileName); } @TestMetadata("fooCast.java") public void testFooCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/fooCast.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeCastExpression/fooCast.java"); doTest(fileName); } @TestMetadata("intCast.java") public void testIntCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/intCast.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeCastExpression/intCast.java"); doTest(fileName); } @TestMetadata("primitiveType.java") public void testPrimitiveType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/primitiveType.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeCastExpression/primitiveType.java"); doTest(fileName); } @TestMetadata("simpleGenericCast.java") public void testSimpleGenericCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeCastExpression/simpleGenericCast.java"); doTest(fileName); } @TestMetadata("stringCast.java") public void testStringCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/stringCast.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeCastExpression/stringCast.java"); doTest(fileName); } @TestMetadata("superWildcardCast.java") public void testSuperWildcardCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/superWildcardCast.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeCastExpression/superWildcardCast.java"); doTest(fileName); } @TestMetadata("wildcardCast.java") public void testWildcardCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/wildcardCast.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeCastExpression/wildcardCast.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/typeParameters") + @TestMetadata("j2k/tests/testData/fileOrElement/typeParameters") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class TypeParameters extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInTypeParameters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/typeParameters"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/typeParameters"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classDoubleParametrizationWithTwoBoundsWithExtending.java") public void testClassDoubleParametrizationWithTwoBoundsWithExtending() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.java"); doTest(fileName); } @TestMetadata("classParametrizationWithTwoBounds.java") public void testClassParametrizationWithTwoBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/classParametrizationWithTwoBounds.java"); doTest(fileName); } @TestMetadata("classParametrizationWithTwoBoundsWithExtending.java") public void testClassParametrizationWithTwoBoundsWithExtending() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/classParametrizationWithTwoBoundsWithExtending.java"); doTest(fileName); } @TestMetadata("complexExampleWithClassExtending.java") public void testComplexExampleWithClassExtending() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/complexExampleWithClassExtending.java"); doTest(fileName); } @TestMetadata("complexExampleWithClassMultiplyExtending.java") public void testComplexExampleWithClassMultiplyExtending() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/complexExampleWithClassMultiplyExtending.java"); doTest(fileName); } @TestMetadata("genericClass.java") public void testGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/genericClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/genericClass.java"); doTest(fileName); } @TestMetadata("genericParam.java") public void testGenericParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/genericParam.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/genericParam.java"); doTest(fileName); } @TestMetadata("genericParam-settings.java") public void testGenericParam_settings() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/genericParam-settings.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/genericParam-settings.java"); doTest(fileName); } @TestMetadata("manyGenericParams.java") public void testManyGenericParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/manyGenericParams.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/manyGenericParams.java"); doTest(fileName); } @TestMetadata("methodDoubleParametrizationWithTwoBounds.java") public void testMethodDoubleParametrizationWithTwoBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/methodDoubleParametrizationWithTwoBounds.java"); doTest(fileName); } @TestMetadata("needTypeArgs.java") public void testNeedTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/needTypeArgs.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/needTypeArgs.java"); doTest(fileName); } @TestMetadata("rawTypeCast.java") public void testRawTypeCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/rawTypeCast.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/rawTypeCast.java"); doTest(fileName); } @TestMetadata("traitDoubleParametrizationWithTwoBoundsWithExtending.java") public void testTraitDoubleParametrizationWithTwoBoundsWithExtending() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.java"); doTest(fileName); } @TestMetadata("typeFromOtherFile.java") public void testTypeFromOtherFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/typeFromOtherFile.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/typeFromOtherFile.java"); doTest(fileName); } @TestMetadata("where.java") public void testWhere() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/where.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/where.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/varArg") + @TestMetadata("j2k/tests/testData/fileOrElement/varArg") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class VarArg extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInVarArg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/varArg"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/varArg"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ellipsisTypeSeveralParams.java") public void testEllipsisTypeSeveralParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/varArg/ellipsisTypeSeveralParams.java"); doTest(fileName); } @TestMetadata("ellipsisTypeSingleParams.java") public void testEllipsisTypeSingleParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/varArg/ellipsisTypeSingleParams.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/whileStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/whileStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class WhileStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInWhileStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/whileStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/whileStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("whileWithBlock.java") public void testWhileWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/whileStatement/whileWithBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/whileStatement/whileWithBlock.java"); doTest(fileName); } @TestMetadata("whileWithEmptyBlock.java") public void testWhileWithEmptyBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/whileStatement/whileWithEmptyBlock.java"); doTest(fileName); } @TestMetadata("whileWithExpression.java") public void testWhileWithExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/whileStatement/whileWithExpression.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/whileStatement/whileWithExpression.java"); doTest(fileName); } @TestMetadata("whileWithReturn.java") public void testWhileWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/whileStatement/whileWithReturn.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/whileStatement/whileWithReturn.java"); doTest(fileName); } } diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterMultiFileTestGenerated.java b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterMultiFileTestGenerated.java new file mode 100644 index 00000000000..f6f78aa89e1 --- /dev/null +++ b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterMultiFileTestGenerated.java @@ -0,0 +1,46 @@ +/* + * Copyright 2010-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.j2k.test; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.jet.JUnit3RunnerWithInners; +import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.test.InnerTestClasses; +import org.jetbrains.jet.test.TestMetadata; +import org.junit.runner.RunWith; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("j2k/tests/testData/multiFile") +@TestDataPath("$PROJECT_ROOT") +@InnerTestClasses({}) +@RunWith(JUnit3RunnerWithInners.class) +public class JavaToKotlinConverterMultiFileTestGenerated extends AbstractJavaToKotlinConverterMultiFileTest { + public void testAllFilesPresentInMultiFile() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/multiFile"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("GetterAndSetterUsages") + public void testGetterAndSetterUsages() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/multiFile/GetterAndSetterUsages/"); + doTest(fileName); + } + +} diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterTestGenerated.java b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterSingleFileTestGenerated.java similarity index 71% rename from j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterTestGenerated.java rename to j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterSingleFileTestGenerated.java index 1934f16abbd..605eb227ebe 100644 --- a/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterTestGenerated.java +++ b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterSingleFileTestGenerated.java @@ -28,3878 +28,3902 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("j2k/tests/testData/ast") +@TestMetadata("j2k/tests/testData/fileOrElement") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({JavaToKotlinConverterTestGenerated.Annotations.class, JavaToKotlinConverterTestGenerated.AnonymousBlock.class, JavaToKotlinConverterTestGenerated.ArrayAccessExpression.class, JavaToKotlinConverterTestGenerated.ArrayInitializerExpression.class, JavaToKotlinConverterTestGenerated.ArrayType.class, JavaToKotlinConverterTestGenerated.AssertStatement.class, JavaToKotlinConverterTestGenerated.AssignmentExpression.class, JavaToKotlinConverterTestGenerated.BinaryExpression.class, JavaToKotlinConverterTestGenerated.Blocks.class, JavaToKotlinConverterTestGenerated.BoxedType.class, JavaToKotlinConverterTestGenerated.BreakStatement.class, JavaToKotlinConverterTestGenerated.CallChainExpression.class, JavaToKotlinConverterTestGenerated.Class.class, JavaToKotlinConverterTestGenerated.ClassExpression.class, JavaToKotlinConverterTestGenerated.Comments.class, JavaToKotlinConverterTestGenerated.ConditionalExpression.class, JavaToKotlinConverterTestGenerated.Constructors.class, JavaToKotlinConverterTestGenerated.ContinueStatement.class, JavaToKotlinConverterTestGenerated.DeclarationStatement.class, JavaToKotlinConverterTestGenerated.DoWhileStatement.class, JavaToKotlinConverterTestGenerated.DropAccessors.class, JavaToKotlinConverterTestGenerated.Enum.class, JavaToKotlinConverterTestGenerated.Equals.class, JavaToKotlinConverterTestGenerated.Field.class, JavaToKotlinConverterTestGenerated.For.class, JavaToKotlinConverterTestGenerated.ForeachStatement.class, JavaToKotlinConverterTestGenerated.Formatting.class, JavaToKotlinConverterTestGenerated.Function.class, JavaToKotlinConverterTestGenerated.Identifier.class, JavaToKotlinConverterTestGenerated.IfStatement.class, JavaToKotlinConverterTestGenerated.ImportStatement.class, JavaToKotlinConverterTestGenerated.InProjectionType.class, JavaToKotlinConverterTestGenerated.Inheritance.class, JavaToKotlinConverterTestGenerated.IsOperator.class, JavaToKotlinConverterTestGenerated.Issues.class, JavaToKotlinConverterTestGenerated.KotlinApiAccess.class, JavaToKotlinConverterTestGenerated.LabelStatement.class, JavaToKotlinConverterTestGenerated.List.class, JavaToKotlinConverterTestGenerated.LiteralExpression.class, JavaToKotlinConverterTestGenerated.LocalVariable.class, JavaToKotlinConverterTestGenerated.MethodCallExpression.class, JavaToKotlinConverterTestGenerated.Misc.class, JavaToKotlinConverterTestGenerated.NewClassExpression.class, JavaToKotlinConverterTestGenerated.Nullability.class, JavaToKotlinConverterTestGenerated.ObjectLiteral.class, JavaToKotlinConverterTestGenerated.OutProjectionType.class, JavaToKotlinConverterTestGenerated.PackageStatement.class, JavaToKotlinConverterTestGenerated.ParenthesizedExpression.class, JavaToKotlinConverterTestGenerated.PolyadicExpression.class, JavaToKotlinConverterTestGenerated.PostfixOperator.class, JavaToKotlinConverterTestGenerated.PrefixOperator.class, JavaToKotlinConverterTestGenerated.RawGenerics.class, JavaToKotlinConverterTestGenerated.ReturnStatement.class, JavaToKotlinConverterTestGenerated.Settings.class, JavaToKotlinConverterTestGenerated.StarProjectionType.class, JavaToKotlinConverterTestGenerated.StaticMembers.class, JavaToKotlinConverterTestGenerated.SuperExpression.class, JavaToKotlinConverterTestGenerated.Switch.class, JavaToKotlinConverterTestGenerated.SynchronizedStatement.class, JavaToKotlinConverterTestGenerated.ThisExpression.class, JavaToKotlinConverterTestGenerated.ThrowStatement.class, JavaToKotlinConverterTestGenerated.ToKotlinClasses.class, JavaToKotlinConverterTestGenerated.Trait.class, JavaToKotlinConverterTestGenerated.TryStatement.class, JavaToKotlinConverterTestGenerated.TryWithResource.class, JavaToKotlinConverterTestGenerated.TypeCastExpression.class, JavaToKotlinConverterTestGenerated.TypeParameters.class, JavaToKotlinConverterTestGenerated.VarArg.class, JavaToKotlinConverterTestGenerated.WhileStatement.class}) +@InnerTestClasses({JavaToKotlinConverterSingleFileTestGenerated.Annotations.class, JavaToKotlinConverterSingleFileTestGenerated.AnonymousBlock.class, JavaToKotlinConverterSingleFileTestGenerated.ArrayAccessExpression.class, JavaToKotlinConverterSingleFileTestGenerated.ArrayInitializerExpression.class, JavaToKotlinConverterSingleFileTestGenerated.ArrayType.class, JavaToKotlinConverterSingleFileTestGenerated.AssertStatement.class, JavaToKotlinConverterSingleFileTestGenerated.AssignmentExpression.class, JavaToKotlinConverterSingleFileTestGenerated.BinaryExpression.class, JavaToKotlinConverterSingleFileTestGenerated.Blocks.class, JavaToKotlinConverterSingleFileTestGenerated.BoxedType.class, JavaToKotlinConverterSingleFileTestGenerated.BreakStatement.class, JavaToKotlinConverterSingleFileTestGenerated.CallChainExpression.class, JavaToKotlinConverterSingleFileTestGenerated.Class.class, JavaToKotlinConverterSingleFileTestGenerated.ClassExpression.class, JavaToKotlinConverterSingleFileTestGenerated.Comments.class, JavaToKotlinConverterSingleFileTestGenerated.ConditionalExpression.class, JavaToKotlinConverterSingleFileTestGenerated.Constructors.class, JavaToKotlinConverterSingleFileTestGenerated.ContinueStatement.class, JavaToKotlinConverterSingleFileTestGenerated.DeclarationStatement.class, JavaToKotlinConverterSingleFileTestGenerated.DoWhileStatement.class, JavaToKotlinConverterSingleFileTestGenerated.DropAccessors.class, JavaToKotlinConverterSingleFileTestGenerated.Enum.class, JavaToKotlinConverterSingleFileTestGenerated.Equals.class, JavaToKotlinConverterSingleFileTestGenerated.Field.class, JavaToKotlinConverterSingleFileTestGenerated.For.class, JavaToKotlinConverterSingleFileTestGenerated.ForeachStatement.class, JavaToKotlinConverterSingleFileTestGenerated.Formatting.class, JavaToKotlinConverterSingleFileTestGenerated.Function.class, JavaToKotlinConverterSingleFileTestGenerated.Identifier.class, JavaToKotlinConverterSingleFileTestGenerated.IfStatement.class, JavaToKotlinConverterSingleFileTestGenerated.ImportStatement.class, JavaToKotlinConverterSingleFileTestGenerated.InProjectionType.class, JavaToKotlinConverterSingleFileTestGenerated.Inheritance.class, JavaToKotlinConverterSingleFileTestGenerated.IsOperator.class, JavaToKotlinConverterSingleFileTestGenerated.Issues.class, JavaToKotlinConverterSingleFileTestGenerated.KotlinApiAccess.class, JavaToKotlinConverterSingleFileTestGenerated.LabelStatement.class, JavaToKotlinConverterSingleFileTestGenerated.List.class, JavaToKotlinConverterSingleFileTestGenerated.LiteralExpression.class, JavaToKotlinConverterSingleFileTestGenerated.LocalVariable.class, JavaToKotlinConverterSingleFileTestGenerated.MethodCallExpression.class, JavaToKotlinConverterSingleFileTestGenerated.Misc.class, JavaToKotlinConverterSingleFileTestGenerated.NewClassExpression.class, JavaToKotlinConverterSingleFileTestGenerated.Nullability.class, JavaToKotlinConverterSingleFileTestGenerated.ObjectLiteral.class, JavaToKotlinConverterSingleFileTestGenerated.OutProjectionType.class, JavaToKotlinConverterSingleFileTestGenerated.PackageStatement.class, JavaToKotlinConverterSingleFileTestGenerated.ParenthesizedExpression.class, JavaToKotlinConverterSingleFileTestGenerated.PolyadicExpression.class, JavaToKotlinConverterSingleFileTestGenerated.PostfixOperator.class, JavaToKotlinConverterSingleFileTestGenerated.PrefixOperator.class, JavaToKotlinConverterSingleFileTestGenerated.RawGenerics.class, JavaToKotlinConverterSingleFileTestGenerated.ReturnStatement.class, JavaToKotlinConverterSingleFileTestGenerated.Settings.class, JavaToKotlinConverterSingleFileTestGenerated.StarProjectionType.class, JavaToKotlinConverterSingleFileTestGenerated.StaticMembers.class, JavaToKotlinConverterSingleFileTestGenerated.SuperExpression.class, JavaToKotlinConverterSingleFileTestGenerated.Switch.class, JavaToKotlinConverterSingleFileTestGenerated.SynchronizedStatement.class, JavaToKotlinConverterSingleFileTestGenerated.ThisExpression.class, JavaToKotlinConverterSingleFileTestGenerated.ThrowStatement.class, JavaToKotlinConverterSingleFileTestGenerated.ToKotlinClasses.class, JavaToKotlinConverterSingleFileTestGenerated.Trait.class, JavaToKotlinConverterSingleFileTestGenerated.TryStatement.class, JavaToKotlinConverterSingleFileTestGenerated.TryWithResource.class, JavaToKotlinConverterSingleFileTestGenerated.TypeCastExpression.class, JavaToKotlinConverterSingleFileTestGenerated.TypeParameters.class, JavaToKotlinConverterSingleFileTestGenerated.VarArg.class, JavaToKotlinConverterSingleFileTestGenerated.WhileStatement.class}) @RunWith(JUnit3RunnerWithInners.class) -public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConverterTest { - public void testAllFilesPresentInAst() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast"), Pattern.compile("^(.+)\\.java$"), true); +public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaToKotlinConverterSingleFileTest { + public void testAllFilesPresentInFileOrElement() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement"), Pattern.compile("^(.+)\\.java$"), true); } - @TestMetadata("j2k/tests/testData/ast/annotations") + @TestMetadata("j2k/tests/testData/fileOrElement/annotations") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Annotations extends AbstractJavaToKotlinConverterTest { + public static class Annotations extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/annotations"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/annotations"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("annotationInterface1.java") public void testAnnotationInterface1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/annotations/annotationInterface1.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/annotations/annotationInterface1.java"); doTest(fileName); } @TestMetadata("annotationInterface2.java") public void testAnnotationInterface2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/annotations/annotationInterface2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/annotations/annotationInterface2.java"); doTest(fileName); } @TestMetadata("annotationInterface3.java") public void testAnnotationInterface3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/annotations/annotationInterface3.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/annotations/annotationInterface3.java"); doTest(fileName); } @TestMetadata("annotationUsages.java") public void testAnnotationUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/annotations/annotationUsages.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/annotations/annotationUsages.java"); doTest(fileName); } @TestMetadata("jetbrainsNotNull.java") public void testJetbrainsNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/annotations/jetbrainsNotNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/annotations/jetbrainsNotNull.java"); doTest(fileName); } @TestMetadata("jetbrainsNotNullChainExpr.java") public void testJetbrainsNotNullChainExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.java"); doTest(fileName); } @TestMetadata("jetbrainsNullable.java") public void testJetbrainsNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/annotations/jetbrainsNullable.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/annotations/jetbrainsNullable.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/anonymousBlock") + @TestMetadata("j2k/tests/testData/fileOrElement/anonymousBlock") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AnonymousBlock extends AbstractJavaToKotlinConverterTest { + public static class AnonymousBlock extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInAnonymousBlock() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/anonymousBlock"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/anonymousBlock"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("oneAnonBlock.java") public void testOneAnonBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/anonymousBlock/oneAnonBlock.java"); doTest(fileName); } @TestMetadata("oneStaticAnonBlock.java") public void testOneStaticAnonBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/arrayAccessExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/arrayAccessExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ArrayAccessExpression extends AbstractJavaToKotlinConverterTest { + public static class ArrayAccessExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInArrayAccessExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/arrayAccessExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/arrayAccessExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("expressionIndex.java") public void testExpressionIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayAccessExpression/expressionIndex.java"); doTest(fileName); } @TestMetadata("intIndex.java") public void testIntIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayAccessExpression/intIndex.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayAccessExpression/intIndex.java"); doTest(fileName); } @TestMetadata("variableIndex.java") public void testVariableIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayAccessExpression/variableIndex.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayAccessExpression/variableIndex.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/arrayInitializerExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ArrayInitializerExpression extends AbstractJavaToKotlinConverterTest { + public static class ArrayInitializerExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInArrayInitializerExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/arrayInitializerExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/arrayInitializerExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("doubleArray.java") public void testDoubleArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/doubleArray.java"); doTest(fileName); } @TestMetadata("doubleArrayWithVariables.java") public void testDoubleArrayWithVariables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/doubleArrayWithVariables.java"); doTest(fileName); } @TestMetadata("floatArray.java") public void testFloatArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/floatArray.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/floatArray.java"); doTest(fileName); } @TestMetadata("intArrayWithLength.java") public void testIntArrayWithLength() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/intArrayWithLength.java"); doTest(fileName); } @TestMetadata("javaLangDoubleArray.java") public void testJavaLangDoubleArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/javaLangDoubleArray.java"); doTest(fileName); } @TestMetadata("javaLangFloatArray.java") public void testJavaLangFloatArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/javaLangFloatArray.java"); doTest(fileName); } @TestMetadata("newByte.java") public void testNewByte() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/newByte.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/newByte.java"); doTest(fileName); } @TestMetadata("newInt.java") public void testNewInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/newInt.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/newInt.java"); doTest(fileName); } @TestMetadata("objectArrayWithLength.java") public void testObjectArrayWithLength() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/objectArrayWithLength.java"); doTest(fileName); } @TestMetadata("oneDim.java") public void testOneDim() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/oneDim.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/oneDim.java"); doTest(fileName); } @TestMetadata("oneDimWithVariables.java") public void testOneDimWithVariables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/oneDimWithVariables.java"); doTest(fileName); } @TestMetadata("twoDim.java") public void testTwoDim() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/twoDim.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayInitializerExpression/twoDim.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/arrayType") + @TestMetadata("j2k/tests/testData/fileOrElement/arrayType") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ArrayType extends AbstractJavaToKotlinConverterTest { + public static class ArrayType extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInArrayType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/arrayType"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/arrayType"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("arrayInitializationStatement.java") public void testArrayInitializationStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/arrayInitializationStatement.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatement.java"); doTest(fileName); } @TestMetadata("arrayInitializationStatementWithDimension.java") public void testArrayInitializationStatementWithDimension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension.java"); doTest(fileName); } @TestMetadata("arrayInitializationStatementWithDimension3d.java") public void testArrayInitializationStatementWithDimension3d() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension3d.java"); doTest(fileName); } @TestMetadata("arrayInitializationStatementWithDimensionExplicit.java") public void testArrayInitializationStatementWithDimensionExplicit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimensionExplicit.java"); doTest(fileName); } @TestMetadata("d2StringEmptyArray.java") public void testD2StringEmptyArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/d2StringEmptyArray.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayType/d2StringEmptyArray.java"); doTest(fileName); } @TestMetadata("d3StringEmptyArray.java") public void testD3StringEmptyArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/d3StringEmptyArray.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayType/d3StringEmptyArray.java"); doTest(fileName); } @TestMetadata("longArray.java") public void testLongArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/longArray.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayType/longArray.java"); doTest(fileName); } @TestMetadata("methodArrayArgs.java") public void testMethodArrayArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/methodArrayArgs.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayType/methodArrayArgs.java"); doTest(fileName); } @TestMetadata("newIntArray.java") public void testNewIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/newIntArray.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayType/newIntArray.java"); doTest(fileName); } @TestMetadata("newStringArray.java") public void testNewStringArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/newStringArray.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/arrayType/newStringArray.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/assertStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/assertStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AssertStatement extends AbstractJavaToKotlinConverterTest { + public static class AssertStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInAssertStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/assertStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/assertStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("onlyCondition.java") public void testOnlyCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assertStatement/onlyCondition.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assertStatement/onlyCondition.java"); doTest(fileName); } @TestMetadata("onlyConditionWithBraces.java") public void testOnlyConditionWithBraces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assertStatement/onlyConditionWithBraces.java"); doTest(fileName); } @TestMetadata("withStringDetail.java") public void testWithStringDetail() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assertStatement/withStringDetail.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assertStatement/withStringDetail.java"); doTest(fileName); } @TestMetadata("withStringDetail2.java") public void testWithStringDetail2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assertStatement/withStringDetail2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assertStatement/withStringDetail2.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/assignmentExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/assignmentExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AssignmentExpression extends AbstractJavaToKotlinConverterTest { + public static class AssignmentExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInAssignmentExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/assignmentExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/assignmentExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("and.java") public void testAnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/and.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/and.java"); doTest(fileName); } @TestMetadata("assignment.java") public void testAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/assignment.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/assignment.java"); doTest(fileName); } @TestMetadata("divideAssign.java") public void testDivideAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/divideAssign.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/divideAssign.java"); doTest(fileName); } @TestMetadata("minusAssign.java") public void testMinusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/minusAssign.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/minusAssign.java"); doTest(fileName); } @TestMetadata("multiplyAssign.java") public void testMultiplyAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/multiplyAssign.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/multiplyAssign.java"); doTest(fileName); } @TestMetadata("nullability.java") public void testNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/nullability.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/nullability.java"); doTest(fileName); } @TestMetadata("nullability-settings.java") public void testNullability_settings() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/nullability-settings.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/nullability-settings.java"); doTest(fileName); } @TestMetadata("or.java") public void testOr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/or.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/or.java"); doTest(fileName); } @TestMetadata("plusAssign.java") public void testPlusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/plusAssign.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/plusAssign.java"); doTest(fileName); } @TestMetadata("reminder.java") public void testReminder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/reminder.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/reminder.java"); doTest(fileName); } @TestMetadata("shiftLeft.java") public void testShiftLeft() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/shiftLeft.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/shiftLeft.java"); doTest(fileName); } @TestMetadata("shiftRight.java") public void testShiftRight() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/shiftRight.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/shiftRight.java"); doTest(fileName); } @TestMetadata("simpleAssignment.java") public void testSimpleAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/simpleAssignment.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/simpleAssignment.java"); doTest(fileName); } @TestMetadata("unsignedRightShift.java") public void testUnsignedRightShift() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/unsignedRightShift.java"); doTest(fileName); } @TestMetadata("xor.java") public void testXor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/xor.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/assignmentExpression/xor.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/binaryExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/binaryExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class BinaryExpression extends AbstractJavaToKotlinConverterTest { + public static class BinaryExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInBinaryExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/binaryExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/binaryExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("and.java") public void testAnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/and.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/and.java"); doTest(fileName); } @TestMetadata("conditionalAnd.java") public void testConditionalAnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/conditionalAnd.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/conditionalAnd.java"); doTest(fileName); } @TestMetadata("conditionalOr.java") public void testConditionalOr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/conditionalOr.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/conditionalOr.java"); doTest(fileName); } @TestMetadata("divide.java") public void testDivide() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/divide.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/divide.java"); doTest(fileName); } @TestMetadata("greaterThan.java") public void testGreaterThan() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/greaterThan.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/greaterThan.java"); doTest(fileName); } @TestMetadata("greaterThanEqual.java") public void testGreaterThanEqual() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/greaterThanEqual.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/greaterThanEqual.java"); doTest(fileName); } @TestMetadata("lessThan.java") public void testLessThan() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/lessThan.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/lessThan.java"); doTest(fileName); } @TestMetadata("lessThanEqual.java") public void testLessThanEqual() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/lessThanEqual.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/lessThanEqual.java"); doTest(fileName); } @TestMetadata("minus.java") public void testMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/minus.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/minus.java"); doTest(fileName); } @TestMetadata("multiplePlusMinus.java") public void testMultiplePlusMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/multiplePlusMinus.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/multiplePlusMinus.java"); doTest(fileName); } @TestMetadata("multiply.java") public void testMultiply() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/multiply.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/multiply.java"); doTest(fileName); } @TestMetadata("or.java") public void testOr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/or.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/or.java"); doTest(fileName); } @TestMetadata("plus.java") public void testPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/plus.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/plus.java"); doTest(fileName); } @TestMetadata("remainder.java") public void testRemainder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/remainder.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/remainder.java"); doTest(fileName); } @TestMetadata("shiftLeft.java") public void testShiftLeft() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/shiftLeft.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/shiftLeft.java"); doTest(fileName); } @TestMetadata("shiftRight.java") public void testShiftRight() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/shiftRight.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/shiftRight.java"); doTest(fileName); } @TestMetadata("unsignedRightShift.java") public void testUnsignedRightShift() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/unsignedRightShift.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/unsignedRightShift.java"); doTest(fileName); } @TestMetadata("xor.java") public void testXor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/xor.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/binaryExpression/xor.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/blocks") + @TestMetadata("j2k/tests/testData/fileOrElement/blocks") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Blocks extends AbstractJavaToKotlinConverterTest { + public static class Blocks extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInBlocks() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/blocks"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/blocks"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("Blocks.java") public void testBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/blocks/Blocks.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/blocks/Blocks.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/boxedType") + @TestMetadata("j2k/tests/testData/fileOrElement/boxedType") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class BoxedType extends AbstractJavaToKotlinConverterTest { + public static class BoxedType extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInBoxedType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/boxedType"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/boxedType"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("boolean.java") public void testBoolean() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/boolean.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/boxedType/boolean.java"); doTest(fileName); } @TestMetadata("Boxing.java") public void testBoxing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/Boxing.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/boxedType/Boxing.java"); doTest(fileName); } @TestMetadata("byte.java") public void testByte() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/byte.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/boxedType/byte.java"); doTest(fileName); } @TestMetadata("character.java") public void testCharacter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/character.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/boxedType/character.java"); doTest(fileName); } @TestMetadata("double.java") public void testDouble() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/double.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/boxedType/double.java"); doTest(fileName); } @TestMetadata("float.java") public void testFloat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/float.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/boxedType/float.java"); doTest(fileName); } @TestMetadata("integer.java") public void testInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/integer.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/boxedType/integer.java"); doTest(fileName); } @TestMetadata("kt-671.java") public void testKt_671() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/kt-671.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/boxedType/kt-671.java"); doTest(fileName); } @TestMetadata("long.java") public void testLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/long.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/boxedType/long.java"); doTest(fileName); } @TestMetadata("object.java") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/object.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/boxedType/object.java"); doTest(fileName); } @TestMetadata("short.java") public void testShort() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/short.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/boxedType/short.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/breakStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/breakStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class BreakStatement extends AbstractJavaToKotlinConverterTest { + public static class BreakStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInBreakStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/breakStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/breakStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("breakWithLabel.java") public void testBreakWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/breakStatement/breakWithLabel.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/breakStatement/breakWithLabel.java"); doTest(fileName); } @TestMetadata("breakWithoutLabel.java") public void testBreakWithoutLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/breakStatement/breakWithoutLabel.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/breakStatement/breakWithoutLabel.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/callChainExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/callChainExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CallChainExpression extends AbstractJavaToKotlinConverterTest { + public static class CallChainExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInCallChainExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/callChainExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/callChainExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("libraryFieldCall.java") public void testLibraryFieldCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/callChainExpression/libraryFieldCall.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/callChainExpression/libraryFieldCall.java"); doTest(fileName); } @TestMetadata("libraryMethodCall.java") public void testLibraryMethodCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/callChainExpression/libraryMethodCall.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/callChainExpression/libraryMethodCall.java"); doTest(fileName); } @TestMetadata("libraryMethodCallFromInstance.java") public void testLibraryMethodCallFromInstance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance.java"); doTest(fileName); } @TestMetadata("libraryMethodCallFromInstance-settings.java") public void testLibraryMethodCallFromInstance_settings() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.java"); doTest(fileName); } @TestMetadata("libraryStringFieldCall.java") public void testLibraryStringFieldCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/callChainExpression/libraryStringFieldCall.java"); doTest(fileName); } @TestMetadata("sout.java") public void testSout() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/callChainExpression/sout.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/callChainExpression/sout.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/class") + @TestMetadata("j2k/tests/testData/fileOrElement/class") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Class extends AbstractJavaToKotlinConverterTest { + public static class Class extends AbstractJavaToKotlinConverterSingleFileTest { @TestMetadata("abstractClass.java") public void testAbstractClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/abstractClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/abstractClass.java"); doTest(fileName); } @TestMetadata("abstractClassShape.java") public void testAbstractClassShape() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/abstractClassShape.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/abstractClassShape.java"); doTest(fileName); } public void testAllFilesPresentInClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/class"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/class"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("class.java") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/class.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/class.java"); doTest(fileName); } @TestMetadata("ClassShadowing.java") public void testClassShadowing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/ClassShadowing.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/ClassShadowing.java"); doTest(fileName); } @TestMetadata("classWithEmptyMethods.java") public void testClassWithEmptyMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/classWithEmptyMethods.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/classWithEmptyMethods.java"); doTest(fileName); } @TestMetadata("classWithFields.java") public void testClassWithFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/classWithFields.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/classWithFields.java"); doTest(fileName); } @TestMetadata("classWithMultiplyFields.java") public void testClassWithMultiplyFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/classWithMultiplyFields.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/classWithMultiplyFields.java"); doTest(fileName); } @TestMetadata("emptyClass.java") public void testEmptyClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/emptyClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/emptyClass.java"); doTest(fileName); } @TestMetadata("extendsOneClassAndImplementsOneInterface.java") public void testExtendsOneClassAndImplementsOneInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/extendsOneClassAndImplementsOneInterface.java"); doTest(fileName); } @TestMetadata("extendsOneClassAndImplementsSeveralInterfaces.java") public void testExtendsOneClassAndImplementsSeveralInterfaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/extendsOneClassAndImplementsSeveralInterfaces.java"); doTest(fileName); } @TestMetadata("finalClass.java") public void testFinalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/finalClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/finalClass.java"); doTest(fileName); } @TestMetadata("genericClass.java") public void testGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/genericClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/genericClass.java"); doTest(fileName); } @TestMetadata("innerClassInInterface.java") public void testInnerClassInInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/innerClassInInterface.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/innerClassInInterface.java"); doTest(fileName); } @TestMetadata("innerEmptyClass.java") public void testInnerEmptyClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/innerEmptyClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/innerEmptyClass.java"); doTest(fileName); } @TestMetadata("innerEnum.java") public void testInnerEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/innerEnum.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/innerEnum.java"); doTest(fileName); } @TestMetadata("innerInterface.java") public void testInnerInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/innerInterface.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/innerInterface.java"); doTest(fileName); } @TestMetadata("innerStaticClass.java") public void testInnerStaticClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/innerStaticClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/innerStaticClass.java"); doTest(fileName); } @TestMetadata("internalClass.java") public void testInternalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/internalClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/internalClass.java"); doTest(fileName); } @TestMetadata("kt-639.java") public void testKt_639() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/kt-639.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/kt-639.java"); doTest(fileName); } @TestMetadata("oneStaticFieldOneNonStatic.java") public void testOneStaticFieldOneNonStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/oneStaticFieldOneNonStatic.java"); doTest(fileName); } @TestMetadata("oneStaticMethod.java") public void testOneStaticMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/oneStaticMethod.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/oneStaticMethod.java"); doTest(fileName); } @TestMetadata("oneStaticMethodOneNonStatic.java") public void testOneStaticMethodOneNonStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/oneStaticMethodOneNonStatic.java"); doTest(fileName); } @TestMetadata("pivateClass.java") public void testPivateClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/pivateClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/pivateClass.java"); doTest(fileName); } @TestMetadata("privateInit.java") public void testPrivateInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/privateInit.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/privateInit.java"); doTest(fileName); } @TestMetadata("protectedClass.java") public void testProtectedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/protectedClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/protectedClass.java"); doTest(fileName); } @TestMetadata("publicClass.java") public void testPublicClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/publicClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/publicClass.java"); doTest(fileName); } @TestMetadata("simpleInheritance.java") public void testSimpleInheritance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/simpleInheritance.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/simpleInheritance.java"); doTest(fileName); } @TestMetadata("twoStaticMethod.java") public void testTwoStaticMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/twoStaticMethod.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/class/twoStaticMethod.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/classExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/classExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassExpression extends AbstractJavaToKotlinConverterTest { + public static class ClassExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInClassExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/classExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/classExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("complexExample.java") public void testComplexExample() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/classExpression/complexExample.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/classExpression/complexExample.java"); doTest(fileName); } @TestMetadata("objectClass.java") public void testObjectClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/classExpression/objectClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/classExpression/objectClass.java"); doTest(fileName); } @TestMetadata("primitivesAndArrays.java") public void testPrimitivesAndArrays() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/classExpression/primitivesAndArrays.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/classExpression/primitivesAndArrays.java"); doTest(fileName); } @TestMetadata("stringClass.java") public void testStringClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/classExpression/stringClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/classExpression/stringClass.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/comments") + @TestMetadata("j2k/tests/testData/fileOrElement/comments") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Comments extends AbstractJavaToKotlinConverterTest { + public static class Comments extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInComments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/comments"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/comments"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("comments.java") public void testComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/comments/comments.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/comments/comments.java"); doTest(fileName); } @TestMetadata("comments2.java") public void testComments2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/comments/comments2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/comments/comments2.java"); doTest(fileName); } @TestMetadata("commentsForConstructors.java") public void testCommentsForConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/comments/commentsForConstructors.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/comments/commentsForConstructors.java"); doTest(fileName); } @TestMetadata("fieldWithEndOfLineComment.java") public void testFieldWithEndOfLineComment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/comments/fieldWithEndOfLineComment.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/comments/fieldWithEndOfLineComment.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams.java") public void testFieldsInitializedFromParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/comments/fieldsInitializedFromParams.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/comments/fieldsInitializedFromParams.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/conditionalExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/conditionalExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConditionalExpression extends AbstractJavaToKotlinConverterTest { + public static class ConditionalExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInConditionalExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/conditionalExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/conditionalExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("multiline.java") public void testMultiline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/conditionalExpression/multiline.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/conditionalExpression/multiline.java"); doTest(fileName); } @TestMetadata("simple.java") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/conditionalExpression/simple.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/conditionalExpression/simple.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/constructors") + @TestMetadata("j2k/tests/testData/fileOrElement/constructors") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Constructors extends AbstractJavaToKotlinConverterTest { + public static class Constructors extends AbstractJavaToKotlinConverterSingleFileTest { @TestMetadata("allCallsPrimary.java") public void testAllCallsPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/allCallsPrimary.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/allCallsPrimary.java"); doTest(fileName); } @TestMetadata("allCallsPrimary2.java") public void testAllCallsPrimary2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/allCallsPrimary2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/allCallsPrimary2.java"); doTest(fileName); } public void testAllFilesPresentInConstructors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/constructors"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/constructors"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("artificialPrimary.java") public void testArtificialPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/artificialPrimary.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/artificialPrimary.java"); doTest(fileName); } @TestMetadata("chain.java") public void testChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/chain.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/chain.java"); doTest(fileName); } @TestMetadata("constructorAnnotations.java") public void testConstructorAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/constructorAnnotations.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/constructorAnnotations.java"); doTest(fileName); } @TestMetadata("customerBuilder.java") public void testCustomerBuilder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/customerBuilder.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/customerBuilder.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams1.java") public void testFieldsInitializedFromParams1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams1.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams2.java") public void testFieldsInitializedFromParams2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams2.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams3.java") public void testFieldsInitializedFromParams3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams3.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams4.java") public void testFieldsInitializedFromParams4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams4.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams5.java") public void testFieldsInitializedFromParams5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams5.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams6.java") public void testFieldsInitializedFromParams6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams6.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams7.java") public void testFieldsInitializedFromParams7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams7.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams8.java") public void testFieldsInitializedFromParams8() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams8.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams8.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams9.java") public void testFieldsInitializedFromParams9() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams9.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams9.java"); doTest(fileName); } @TestMetadata("genericIdentifier.java") public void testGenericIdentifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/genericIdentifier.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/genericIdentifier.java"); doTest(fileName); } @TestMetadata("identifier.java") public void testIdentifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/identifier.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/identifier.java"); doTest(fileName); } @TestMetadata("methodCallInFactoryFun.java") public void testMethodCallInFactoryFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/methodCallInFactoryFun.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/methodCallInFactoryFun.java"); doTest(fileName); } @TestMetadata("nestedClassNameInParameterDefaults.java") public void testNestedClassNameInParameterDefaults() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.java"); doTest(fileName); } @TestMetadata("nestedClassNameInParameterDefaults2.java") public void testNestedClassNameInParameterDefaults2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.java"); doTest(fileName); } @TestMetadata("nestedClassNameInParameterDefaults3.java") public void testNestedClassNameInParameterDefaults3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults3.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.java"); doTest(fileName); } @TestMetadata("nestedClassNameInParameterDefaults4.java") public void testNestedClassNameInParameterDefaults4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults4.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.java"); doTest(fileName); } @TestMetadata("nestedClassNameInSuperParameters.java") public void testNestedClassNameInSuperParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/nestedClassNameInSuperParameters.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.java"); doTest(fileName); } @TestMetadata("noPrimary.java") public void testNoPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/noPrimary.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/noPrimary.java"); doTest(fileName); } @TestMetadata("parameterDefaults1.java") public void testParameterDefaults1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/parameterDefaults1.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/parameterDefaults1.java"); doTest(fileName); } @TestMetadata("parameterDefaults2.java") public void testParameterDefaults2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/parameterDefaults2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/parameterDefaults2.java"); doTest(fileName); } @TestMetadata("parameterDefaults3.java") public void testParameterDefaults3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/parameterDefaults3.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/parameterDefaults3.java"); doTest(fileName); } @TestMetadata("parameterDefaults4.java") public void testParameterDefaults4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/parameterDefaults4.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/parameterDefaults4.java"); doTest(fileName); } @TestMetadata("parameterDefaults5.java") public void testParameterDefaults5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/parameterDefaults5.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/parameterDefaults5.java"); doTest(fileName); } @TestMetadata("parameterModification.java") public void testParameterModification() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/parameterModification.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/parameterModification.java"); doTest(fileName); } @TestMetadata("privateConstructors.java") public void testPrivateConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/privateConstructors.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/privateConstructors.java"); doTest(fileName); } @TestMetadata("qualifiedRefInFactoryFun.java") public void testQualifiedRefInFactoryFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/qualifiedRefInFactoryFun.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/qualifiedRefInFactoryFun.java"); doTest(fileName); } @TestMetadata("secondaryConstructorsInInnerClass.java") public void testSecondaryConstructorsInInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/secondaryConstructorsInInnerClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/secondaryConstructorsInInnerClass.java"); doTest(fileName); } @TestMetadata("secondaryConstructorsInNestedClass.java") public void testSecondaryConstructorsInNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/secondaryConstructorsInNestedClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.java"); doTest(fileName); } @TestMetadata("secondaryConstructorsVisibility.java") public void testSecondaryConstructorsVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/secondaryConstructorsVisibility.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/secondaryConstructorsVisibility.java"); doTest(fileName); } @TestMetadata("staticFieldRefInFactoryFun.java") public void testStaticFieldRefInFactoryFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/staticFieldRefInFactoryFun.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.java"); doTest(fileName); } @TestMetadata("withManyDefaultParams.java") public void testWithManyDefaultParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/withManyDefaultParams.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/constructors/withManyDefaultParams.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/continueStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/continueStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ContinueStatement extends AbstractJavaToKotlinConverterTest { + public static class ContinueStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInContinueStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/continueStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/continueStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("continueWithLabel.java") public void testContinueWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/continueStatement/continueWithLabel.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/continueStatement/continueWithLabel.java"); doTest(fileName); } @TestMetadata("continueWithoutLabel.java") public void testContinueWithoutLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/continueStatement/continueWithoutLabel.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/continueStatement/continueWithoutLabel.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/declarationStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/declarationStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DeclarationStatement extends AbstractJavaToKotlinConverterTest { + public static class DeclarationStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInDeclarationStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/declarationStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/declarationStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("multiplyFinalIntDeclaration.java") public void testMultiplyFinalIntDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/declarationStatement/multiplyFinalIntDeclaration.java"); doTest(fileName); } @TestMetadata("multiplyIntDeclaration.java") public void testMultiplyIntDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/declarationStatement/multiplyIntDeclaration.java"); doTest(fileName); } @TestMetadata("singleFinalIntDeclaration.java") public void testSingleFinalIntDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/declarationStatement/singleFinalIntDeclaration.java"); doTest(fileName); } @TestMetadata("singleFinalStringDeclaration.java") public void testSingleFinalStringDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/declarationStatement/singleFinalStringDeclaration.java"); doTest(fileName); } @TestMetadata("singleIntDeclaration.java") public void testSingleIntDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/declarationStatement/singleIntDeclaration.java"); doTest(fileName); } @TestMetadata("singleStringDeclaration.java") public void testSingleStringDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/declarationStatement/singleStringDeclaration.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/doWhileStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/doWhileStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DoWhileStatement extends AbstractJavaToKotlinConverterTest { + public static class DoWhileStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInDoWhileStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/doWhileStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/doWhileStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("whileWithBlock.java") public void testWhileWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/doWhileStatement/whileWithBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/doWhileStatement/whileWithBlock.java"); doTest(fileName); } @TestMetadata("whileWithEmptyBlock.java") public void testWhileWithEmptyBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/doWhileStatement/whileWithEmptyBlock.java"); doTest(fileName); } @TestMetadata("whileWithExpression.java") public void testWhileWithExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/doWhileStatement/whileWithExpression.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/doWhileStatement/whileWithExpression.java"); doTest(fileName); } @TestMetadata("whileWithReturn.java") public void testWhileWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/doWhileStatement/whileWithReturn.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/doWhileStatement/whileWithReturn.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/dropAccessors") + @TestMetadata("j2k/tests/testData/fileOrElement/dropAccessors") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DropAccessors extends AbstractJavaToKotlinConverterTest { + public static class DropAccessors extends AbstractJavaToKotlinConverterSingleFileTest { @TestMetadata("AccessInGetterWithThis.java") public void testAccessInGetterWithThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/AccessInGetterWithThis.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/AccessInGetterWithThis.java"); doTest(fileName); } public void testAllFilesPresentInDropAccessors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/dropAccessors"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/dropAccessors"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("CannotDropOnlySetter.java") public void testCannotDropOnlySetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/CannotDropOnlySetter.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/CannotDropOnlySetter.java"); doTest(fileName); } @TestMetadata("DataClass.java") public void testDataClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/DataClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/DataClass.java"); doTest(fileName); } @TestMetadata("DataClassWithMutableField.java") public void testDataClassWithMutableField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/DataClassWithMutableField.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/DataClassWithMutableField.java"); doTest(fileName); } @TestMetadata("DifferentFieldName.java") public void testDifferentFieldName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/DifferentFieldName.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/DifferentFieldName.java"); + doTest(fileName); + } + + @TestMetadata("DifferentFieldNameAndDefaultParameterValue.java") + public void testDifferentFieldNameAndDefaultParameterValue() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.java"); + doTest(fileName); + } + + @TestMetadata("DifferentFieldNameAndSuperClass.java") + public void testDifferentFieldNameAndSuperClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.java"); + doTest(fileName); + } + + @TestMetadata("DifferentProtectedFieldName.java") + public void testDifferentProtectedFieldName() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.java"); doTest(fileName); } @TestMetadata("DropGetter.java") public void testDropGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/DropGetter.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/DropGetter.java"); doTest(fileName); } @TestMetadata("DropGetterAndSetter.java") public void testDropGetterAndSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/DropGetterAndSetter.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/DropGetterAndSetter.java"); doTest(fileName); } @TestMetadata("DropGetterForMutable.java") public void testDropGetterForMutable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/DropGetterForMutable.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/DropGetterForMutable.java"); doTest(fileName); } @TestMetadata("FalseGetter.java") public void testFalseGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/FalseGetter.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/FalseGetter.java"); doTest(fileName); } @TestMetadata("FalseSetter.java") public void testFalseSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/FalseSetter.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/FalseSetter.java"); doTest(fileName); } @TestMetadata("FieldUsagesInFactoryMethods.java") public void testFieldUsagesInFactoryMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/FieldUsagesInFactoryMethods.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.java"); doTest(fileName); } @TestMetadata("GetterAndSetterNamesDifferent.java") public void testGetterAndSetterNamesDifferent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/dropAccessors/GetterAndSetterNamesDifferent.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/GetterAndSetterNamesDifferent.java"); + doTest(fileName); + } + + @TestMetadata("GetterSetterUsages.java") + public void testGetterSetterUsages() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/dropAccessors/GetterSetterUsages.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/enum") + @TestMetadata("j2k/tests/testData/fileOrElement/enum") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Enum extends AbstractJavaToKotlinConverterTest { + public static class Enum extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInEnum() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/enum"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/enum"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("colorEnum.java") public void testColorEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/colorEnum.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/colorEnum.java"); doTest(fileName); } @TestMetadata("emptyEnum.java") public void testEmptyEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/emptyEnum.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/emptyEnum.java"); doTest(fileName); } @TestMetadata("enumConstantIsNotNull.java") public void testEnumConstantIsNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/enumConstantIsNotNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/enumConstantIsNotNull.java"); doTest(fileName); } @TestMetadata("enumImplementsOneInterface.java") public void testEnumImplementsOneInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/enumImplementsOneInterface.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/enumImplementsOneInterface.java"); doTest(fileName); } @TestMetadata("enumImplementsSeveralInterfaces.java") public void testEnumImplementsSeveralInterfaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/enumImplementsSeveralInterfaces.java"); doTest(fileName); } @TestMetadata("enumWithNameField.java") public void testEnumWithNameField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/enumWithNameField.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/enumWithNameField.java"); doTest(fileName); } @TestMetadata("fieldsWithPrimaryPrivateConstructor.java") public void testFieldsWithPrimaryPrivateConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/fieldsWithPrimaryPrivateConstructor.java"); doTest(fileName); } @TestMetadata("internalEnum.java") public void testInternalEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/internalEnum.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/internalEnum.java"); doTest(fileName); } @TestMetadata("overrideToString.java") public void testOverrideToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/overrideToString.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/overrideToString.java"); doTest(fileName); } @TestMetadata("primaryPrivateConstructor.java") public void testPrimaryPrivateConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/primaryPrivateConstructor.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/primaryPrivateConstructor.java"); doTest(fileName); } @TestMetadata("privateEnum.java") public void testPrivateEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/privateEnum.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/privateEnum.java"); doTest(fileName); } @TestMetadata("protectedEnum.java") public void testProtectedEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/protectedEnum.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/protectedEnum.java"); doTest(fileName); } @TestMetadata("publicEnum.java") public void testPublicEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/publicEnum.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/publicEnum.java"); doTest(fileName); } @TestMetadata("runnableImplementation.java") public void testRunnableImplementation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/runnableImplementation.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/runnableImplementation.java"); doTest(fileName); } @TestMetadata("typeSafeEnum.java") public void testTypeSafeEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/typeSafeEnum.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/enum/typeSafeEnum.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/equals") + @TestMetadata("j2k/tests/testData/fileOrElement/equals") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Equals extends AbstractJavaToKotlinConverterTest { + public static class Equals extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInEquals() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/equals"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/equals"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("Equals1.java") public void testEquals1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/equals/Equals1.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/equals/Equals1.java"); doTest(fileName); } @TestMetadata("Equals2.java") public void testEquals2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/equals/Equals2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/equals/Equals2.java"); doTest(fileName); } @TestMetadata("Equals3.java") public void testEquals3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/equals/Equals3.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/equals/Equals3.java"); doTest(fileName); } @TestMetadata("Equals4.java") public void testEquals4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/equals/Equals4.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/equals/Equals4.java"); doTest(fileName); } @TestMetadata("ObjectsEquals.java") public void testObjectsEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/equals/ObjectsEquals.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/equals/ObjectsEquals.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/field") + @TestMetadata("j2k/tests/testData/fileOrElement/field") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Field extends AbstractJavaToKotlinConverterTest { + public static class Field extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInField() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/field"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/field"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classChildExtendsBase.java") public void testClassChildExtendsBase() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/classChildExtendsBase.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/classChildExtendsBase.java"); doTest(fileName); } @TestMetadata("conversion.java") public void testConversion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/conversion.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/conversion.java"); doTest(fileName); } @TestMetadata("internalField.java") public void testInternalField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/internalField.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/internalField.java"); doTest(fileName); } @TestMetadata("privateField.java") public void testPrivateField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/privateField.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/privateField.java"); doTest(fileName); } @TestMetadata("protectedField.java") public void testProtectedField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/protectedField.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/protectedField.java"); doTest(fileName); } @TestMetadata("publicField.java") public void testPublicField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/publicField.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/publicField.java"); doTest(fileName); } @TestMetadata("specifyType.java") public void testSpecifyType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/specifyType.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/specifyType.java"); doTest(fileName); } @TestMetadata("valOrVar.java") public void testValOrVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/valOrVar.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/valOrVar.java"); doTest(fileName); } @TestMetadata("valWithInit.java") public void testValWithInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/valWithInit.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/valWithInit.java"); doTest(fileName); } @TestMetadata("varWithInit.java") public void testVarWithInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/varWithInit.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/varWithInit.java"); doTest(fileName); } @TestMetadata("varWithoutInit.java") public void testVarWithoutInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/varWithoutInit.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/varWithoutInit.java"); doTest(fileName); } @TestMetadata("volatileTransientAndStrictFp.java") public void testVolatileTransientAndStrictFp() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/volatileTransientAndStrictFp.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/field/volatileTransientAndStrictFp.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/for") + @TestMetadata("j2k/tests/testData/fileOrElement/for") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class For extends AbstractJavaToKotlinConverterTest { + public static class For extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInFor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/for"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/for"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("commonCaseForTest.java") public void testCommonCaseForTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/commonCaseForTest.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/commonCaseForTest.java"); doTest(fileName); } @TestMetadata("falseForRange.java") public void testFalseForRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/falseForRange.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/falseForRange.java"); doTest(fileName); } @TestMetadata("forRangeWithBlock.java") public void testForRangeWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forRangeWithBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forRangeWithBlock.java"); doTest(fileName); } @TestMetadata("forRangeWithLE.java") public void testForRangeWithLE() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forRangeWithLE.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forRangeWithLE.java"); doTest(fileName); } @TestMetadata("forRangeWithLT.java") public void testForRangeWithLT() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forRangeWithLT.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forRangeWithLT.java"); doTest(fileName); } @TestMetadata("forThroughArrayIndices.java") public void testForThroughArrayIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forThroughArrayIndices.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forThroughArrayIndices.java"); doTest(fileName); } @TestMetadata("forThroughListIndices.java") public void testForThroughListIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forThroughListIndices.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forThroughListIndices.java"); doTest(fileName); } @TestMetadata("forThroughNonArrayIndices.java") public void testForThroughNonArrayIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forThroughNonArrayIndices.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forThroughNonArrayIndices.java"); doTest(fileName); } @TestMetadata("forThroughNonCollectionIndices.java") public void testForThroughNonCollectionIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forThroughNonCollectionIndices.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forThroughNonCollectionIndices.java"); doTest(fileName); } @TestMetadata("forWithBlock.java") public void testForWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forWithBlock.java"); doTest(fileName); } @TestMetadata("forWithBlockAndDoubleUpdate.java") public void testForWithBlockAndDoubleUpdate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forWithBlockAndDoubleUpdate.java"); doTest(fileName); } @TestMetadata("forWithEmptyBlock.java") public void testForWithEmptyBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithEmptyBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forWithEmptyBlock.java"); doTest(fileName); } @TestMetadata("forWithExpression.java") public void testForWithExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithExpression.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forWithExpression.java"); doTest(fileName); } @TestMetadata("forWithNullCondition.java") public void testForWithNullCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithNullCondition.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forWithNullCondition.java"); doTest(fileName); } @TestMetadata("forWithNullInit.java") public void testForWithNullInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithNullInit.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forWithNullInit.java"); doTest(fileName); } @TestMetadata("forWithNullUpdate.java") public void testForWithNullUpdate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithNullUpdate.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forWithNullUpdate.java"); doTest(fileName); } @TestMetadata("forWithReturn.java") public void testForWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithReturn.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/forWithReturn.java"); doTest(fileName); } @TestMetadata("infiniteFor.java") public void testInfiniteFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/infiniteFor.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/for/infiniteFor.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/foreachStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/foreachStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ForeachStatement extends AbstractJavaToKotlinConverterTest { + public static class ForeachStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInForeachStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/foreachStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/foreachStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("enhancedForWithBlock.java") public void testEnhancedForWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithBlock.java"); doTest(fileName); } @TestMetadata("enhancedForWithEmptyBlock.java") public void testEnhancedForWithEmptyBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithEmptyBlock.java"); doTest(fileName); } @TestMetadata("enhancedForWithExpression.java") public void testEnhancedForWithExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithExpression.java"); doTest(fileName); } @TestMetadata("enhancedForWithReturn.java") public void testEnhancedForWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithReturn.java"); doTest(fileName); } @TestMetadata("nullableIterable.java") public void testNullableIterable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/foreachStatement/nullableIterable.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/foreachStatement/nullableIterable.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/formatting") + @TestMetadata("j2k/tests/testData/fileOrElement/formatting") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Formatting extends AbstractJavaToKotlinConverterTest { + public static class Formatting extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInFormatting() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/formatting"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/formatting"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("nonStaticMembers.java") public void testNonStaticMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/formatting/nonStaticMembers.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/formatting/nonStaticMembers.java"); doTest(fileName); } @TestMetadata("nonStaticMembersWithComments.java") public void testNonStaticMembersWithComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/formatting/nonStaticMembersWithComments.java"); doTest(fileName); } @TestMetadata("staticAndNonStaticMembersWithComments.java") public void testStaticAndNonStaticMembersWithComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.java"); doTest(fileName); } @TestMetadata("staticMembersWithComments.java") public void testStaticMembersWithComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/formatting/staticMembersWithComments.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/formatting/staticMembersWithComments.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/function") + @TestMetadata("j2k/tests/testData/fileOrElement/function") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Function extends AbstractJavaToKotlinConverterTest { + public static class Function extends AbstractJavaToKotlinConverterSingleFileTest { @TestMetadata("abstractMethod.java") public void testAbstractMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/abstractMethod.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/abstractMethod.java"); doTest(fileName); } public void testAllFilesPresentInFunction() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/function"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/function"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classGenericParam.java") public void testClassGenericParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/classGenericParam.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/classGenericParam.java"); doTest(fileName); } @TestMetadata("emptyVoidMethod.java") public void testEmptyVoidMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/emptyVoidMethod.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/emptyVoidMethod.java"); doTest(fileName); } @TestMetadata("extendsBaseWhichExtendsObject.java") public void testExtendsBaseWhichExtendsObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/extendsBaseWhichExtendsObject.java"); doTest(fileName); } @TestMetadata("final.java") public void testFinal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/final.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/final.java"); doTest(fileName); } @TestMetadata("functionInFinalClass.java") public void testFunctionInFinalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/functionInFinalClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/functionInFinalClass.java"); doTest(fileName); } @TestMetadata("internal.java") public void testInternal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/internal.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/internal.java"); doTest(fileName); } @TestMetadata("main.java") public void testMain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/main.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/main.java"); doTest(fileName); } @TestMetadata("main2.java") public void testMain2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/main2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/main2.java"); doTest(fileName); } @TestMetadata("mainAndNullabilitySetting.java") public void testMainAndNullabilitySetting() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/mainAndNullabilitySetting.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/mainAndNullabilitySetting.java"); doTest(fileName); } @TestMetadata("methodClassType.java") public void testMethodClassType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/methodClassType.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/methodClassType.java"); doTest(fileName); } @TestMetadata("methodPrimitiveType.java") public void testMethodPrimitiveType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/methodPrimitiveType.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/methodPrimitiveType.java"); doTest(fileName); } @TestMetadata("methodPrimitiveType2.java") public void testMethodPrimitiveType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/methodPrimitiveType2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/methodPrimitiveType2.java"); doTest(fileName); } @TestMetadata("methodWithReturnStatement.java") public void testMethodWithReturnStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/methodWithReturnStatement.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/methodWithReturnStatement.java"); doTest(fileName); } @TestMetadata("open.java") public void testOpen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/open.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/open.java"); doTest(fileName); } @TestMetadata("override.java") public void testOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/override.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/override.java"); doTest(fileName); } @TestMetadata("overrideAndOpen.java") public void testOverrideAndOpen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/overrideAndOpen.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/overrideAndOpen.java"); doTest(fileName); } @TestMetadata("overrideObject.java") public void testOverrideObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/overrideObject.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/overrideObject.java"); doTest(fileName); } @TestMetadata("overrideObject2.java") public void testOverrideObject2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/overrideObject2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/overrideObject2.java"); doTest(fileName); } @TestMetadata("overrideObject3.java") public void testOverrideObject3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/overrideObject3.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/overrideObject3.java"); doTest(fileName); } @TestMetadata("ownGenericParam.java") public void testOwnGenericParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/ownGenericParam.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/ownGenericParam.java"); doTest(fileName); } @TestMetadata("ownSeveralGenericParams.java") public void testOwnSeveralGenericParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/ownSeveralGenericParams.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/ownSeveralGenericParams.java"); doTest(fileName); } @TestMetadata("parameterModification.java") public void testParameterModification() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/parameterModification.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/parameterModification.java"); doTest(fileName); } @TestMetadata("private.java") public void testPrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/private.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/private.java"); doTest(fileName); } @TestMetadata("protected.java") public void testProtected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/protected.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/protected.java"); doTest(fileName); } @TestMetadata("public.java") public void testPublic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/public.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/public.java"); doTest(fileName); } @TestMetadata("synchronizedMethod.java") public void testSynchronizedMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/synchronizedMethod.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/synchronizedMethod.java"); doTest(fileName); } @TestMetadata("throws.java") public void testThrows() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/throws.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/throws.java"); doTest(fileName); } @TestMetadata("varVararg.java") public void testVarVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/varVararg.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/function/varVararg.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/identifier") + @TestMetadata("j2k/tests/testData/fileOrElement/identifier") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Identifier extends AbstractJavaToKotlinConverterTest { + public static class Identifier extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInIdentifier() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/identifier"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/identifier"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("finalFieldReference.java") public void testFinalFieldReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/identifier/finalFieldReference.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/identifier/finalFieldReference.java"); doTest(fileName); } @TestMetadata("keywords.java") public void testKeywords() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/identifier/keywords.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/identifier/keywords.java"); doTest(fileName); } @TestMetadata("withDollar.java") public void testWithDollar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/identifier/withDollar.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/identifier/withDollar.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/ifStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/ifStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class IfStatement extends AbstractJavaToKotlinConverterTest { + public static class IfStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInIfStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/ifStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/ifStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("elseIf.java") public void testElseIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/ifStatement/elseIf.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/ifStatement/elseIf.java"); doTest(fileName); } @TestMetadata("multiLine.java") public void testMultiLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/ifStatement/multiLine.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/ifStatement/multiLine.java"); doTest(fileName); } @TestMetadata("singleLine.java") public void testSingleLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/ifStatement/singleLine.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/ifStatement/singleLine.java"); doTest(fileName); } @TestMetadata("withBlocks.java") public void testWithBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/ifStatement/withBlocks.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/ifStatement/withBlocks.java"); doTest(fileName); } @TestMetadata("withEmptyBlocks.java") public void testWithEmptyBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/ifStatement/withEmptyBlocks.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/ifStatement/withEmptyBlocks.java"); doTest(fileName); } @TestMetadata("withoutElse.java") public void testWithoutElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/ifStatement/withoutElse.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/ifStatement/withoutElse.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/importStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/importStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ImportStatement extends AbstractJavaToKotlinConverterTest { + public static class ImportStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInImportStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/importStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/importStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("importWithKeywords.java") public void testImportWithKeywords() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/importStatement/importWithKeywords.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/importStatement/importWithKeywords.java"); doTest(fileName); } @TestMetadata("importWithStar.java") public void testImportWithStar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/importStatement/importWithStar.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/importStatement/importWithStar.java"); doTest(fileName); } @TestMetadata("oneImport.java") public void testOneImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/importStatement/oneImport.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/importStatement/oneImport.java"); doTest(fileName); } @TestMetadata("onlyImports.java") public void testOnlyImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/importStatement/onlyImports.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/importStatement/onlyImports.java"); doTest(fileName); } @TestMetadata("simpleImport.java") public void testSimpleImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/importStatement/simpleImport.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/importStatement/simpleImport.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/inProjectionType") + @TestMetadata("j2k/tests/testData/fileOrElement/inProjectionType") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class InProjectionType extends AbstractJavaToKotlinConverterTest { + public static class InProjectionType extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInInProjectionType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/inProjectionType"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/inProjectionType"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("methodParams.java") public void testMethodParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/inProjectionType/methodParams.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/inProjectionType/methodParams.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/inheritance") + @TestMetadata("j2k/tests/testData/fileOrElement/inheritance") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Inheritance extends AbstractJavaToKotlinConverterTest { + public static class Inheritance extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInInheritance() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/inheritance"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/inheritance"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classOneExtendsBaseGeneric.java") public void testClassOneExtendsBaseGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseGeneric.java"); doTest(fileName); } @TestMetadata("classOneExtendsBaseWithOneParam.java") public void testClassOneExtendsBaseWithOneParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseWithOneParam.java"); doTest(fileName); } @TestMetadata("classOneExtendsBaseWithZeroParams.java") public void testClassOneExtendsBaseWithZeroParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParams.java"); doTest(fileName); } @TestMetadata("classOneExtendsBaseWithZeroParamsNonEmptyConstructor.java") public void testClassOneExtendsBaseWithZeroParamsNonEmptyConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/isOperator") + @TestMetadata("j2k/tests/testData/fileOrElement/isOperator") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class IsOperator extends AbstractJavaToKotlinConverterTest { + public static class IsOperator extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInIsOperator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/isOperator"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/isOperator"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("complicatedExpression.java") public void testComplicatedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/isOperator/complicatedExpression.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/isOperator/complicatedExpression.java"); doTest(fileName); } @TestMetadata("simpleReference.java") public void testSimpleReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/isOperator/simpleReference.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/isOperator/simpleReference.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/issues") + @TestMetadata("j2k/tests/testData/fileOrElement/issues") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Issues extends AbstractJavaToKotlinConverterTest { + public static class Issues extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInIssues() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/issues"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/issues"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("arrayLength.java") public void testArrayLength() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/arrayLength.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/arrayLength.java"); doTest(fileName); } @TestMetadata("comments.java") public void testComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/comments.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/comments.java"); doTest(fileName); } @TestMetadata("doNotQualifyStatic.java") public void testDoNotQualifyStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/doNotQualifyStatic.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/doNotQualifyStatic.java"); doTest(fileName); } @TestMetadata("kt-1016.java") public void testKt_1016() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-1016.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-1016.java"); doTest(fileName); } @TestMetadata("kt-1048.java") public void testKt_1048() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-1048.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-1048.java"); doTest(fileName); } @TestMetadata("kt-1074.java") public void testKt_1074() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-1074.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-1074.java"); doTest(fileName); } @TestMetadata("kt-5294.java") public void testKt_5294() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-5294.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-5294.java"); doTest(fileName); } @TestMetadata("kt-5400.java") public void testKt_5400() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-5400.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-5400.java"); doTest(fileName); } @TestMetadata("kt-543.java") public void testKt_543() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-543.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-543.java"); doTest(fileName); } @TestMetadata("kt-543-boxed.java") public void testKt_543_boxed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-543-boxed.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-543-boxed.java"); doTest(fileName); } @TestMetadata("kt-543-mixed.java") public void testKt_543_mixed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-543-mixed.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-543-mixed.java"); doTest(fileName); } @TestMetadata("kt-638.java") public void testKt_638() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-638.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-638.java"); doTest(fileName); } @TestMetadata("kt-696.java") public void testKt_696() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-696.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-696.java"); doTest(fileName); } @TestMetadata("kt-792.java") public void testKt_792() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-792.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-792.java"); doTest(fileName); } @TestMetadata("kt-792-mixed.java") public void testKt_792_mixed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-792-mixed.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-792-mixed.java"); doTest(fileName); } @TestMetadata("kt-794.java") public void testKt_794() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-794.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-794.java"); doTest(fileName); } @TestMetadata("kt-794-mixed.java") public void testKt_794_mixed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-794-mixed.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-794-mixed.java"); doTest(fileName); } @TestMetadata("kt-807.java") public void testKt_807() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-807.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-807.java"); doTest(fileName); } @TestMetadata("kt-809.java") public void testKt_809() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-809.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-809.java"); doTest(fileName); } @TestMetadata("kt-809-string.java") public void testKt_809_string() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-809-string.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-809-string.java"); doTest(fileName); } @TestMetadata("kt-820.java") public void testKt_820() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-820.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-820.java"); doTest(fileName); } @TestMetadata("kt-820-field.java") public void testKt_820_field() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-820-field.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-820-field.java"); doTest(fileName); } @TestMetadata("kt-820-string.java") public void testKt_820_string() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-820-string.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-820-string.java"); doTest(fileName); } @TestMetadata("kt-824.java") public void testKt_824() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-824.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-824.java"); doTest(fileName); } @TestMetadata("kt-824-isDir.java") public void testKt_824_isDir() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-824-isDir.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-824-isDir.java"); doTest(fileName); } @TestMetadata("kt-828.java") public void testKt_828() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-828.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-828.java"); doTest(fileName); } @TestMetadata("kt-836.java") public void testKt_836() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-836.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-836.java"); doTest(fileName); } @TestMetadata("kt-837.java") public void testKt_837() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-837.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-837.java"); doTest(fileName); } @TestMetadata("kt-851.java") public void testKt_851() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-851.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-851.java"); doTest(fileName); } @TestMetadata("kt-852.java") public void testKt_852() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-852.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-852.java"); doTest(fileName); } @TestMetadata("kt-871.java") public void testKt_871() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-871.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-871.java"); doTest(fileName); } @TestMetadata("kt-879.java") public void testKt_879() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-879.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-879.java"); doTest(fileName); } @TestMetadata("kt-893.java") public void testKt_893() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-893.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-893.java"); doTest(fileName); } @TestMetadata("kt-899.java") public void testKt_899() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-899.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-899.java"); doTest(fileName); } @TestMetadata("kt-963.java") public void testKt_963() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-963.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/kt-963.java"); doTest(fileName); } @TestMetadata("qualifyStatic.java") public void testQualifyStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/qualifyStatic.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/qualifyStatic.java"); doTest(fileName); } @TestMetadata("spaceBeforeAssignment.java") public void testSpaceBeforeAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/spaceBeforeAssignment.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/issues/spaceBeforeAssignment.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/kotlinApiAccess") + @TestMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinApiAccess extends AbstractJavaToKotlinConverterTest { + public static class KotlinApiAccess extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInKotlinApiAccess() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/kotlinApiAccess"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/kotlinApiAccess"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ClassObjectMembers.java") public void testClassObjectMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/ClassObjectMembers.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.java"); doTest(fileName); } @TestMetadata("CorrectFunNullabilityDetected.java") public void testCorrectFunNullabilityDetected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/CorrectFunNullabilityDetected.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/CorrectFunNullabilityDetected.java"); doTest(fileName); } @TestMetadata("CorrectNullabilityDetected.java") public void testCorrectNullabilityDetected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/CorrectNullabilityDetected.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.java"); doTest(fileName); } @TestMetadata("ExtensionFunction.java") public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/ExtensionFunction.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/ExtensionFunction.java"); doTest(fileName); } @TestMetadata("ExtensionProperty.java") public void testExtensionProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/ExtensionProperty.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/ExtensionProperty.java"); doTest(fileName); } @TestMetadata("GlobalFunction.java") public void testGlobalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/GlobalFunction.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalFunction.java"); doTest(fileName); } @TestMetadata("GlobalGenericFunction.java") public void testGlobalGenericFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/GlobalGenericFunction.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalGenericFunction.java"); doTest(fileName); } @TestMetadata("GlobalValue1.java") public void testGlobalValue1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/GlobalValue1.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalValue1.java"); doTest(fileName); } @TestMetadata("GlobalValue2.java") public void testGlobalValue2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/GlobalValue2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalValue2.java"); doTest(fileName); } @TestMetadata("InheritedProperty.java") public void testInheritedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/InheritedProperty.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/InheritedProperty.java"); doTest(fileName); } @TestMetadata("ObjectMembers.java") public void testObjectMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/ObjectMembers.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/ObjectMembers.java"); doTest(fileName); } @TestMetadata("Property.java") public void testProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/Property.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/Property.java"); doTest(fileName); } @TestMetadata("Property2.java") public void testProperty2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/Property2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/kotlinApiAccess/Property2.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/labelStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/labelStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class LabelStatement extends AbstractJavaToKotlinConverterTest { + public static class LabelStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInLabelStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/labelStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/labelStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("complicatedExampleFromJavaTutorial.java") public void testComplicatedExampleFromJavaTutorial() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/labelStatement/complicatedExampleFromJavaTutorial.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/list") + @TestMetadata("j2k/tests/testData/fileOrElement/list") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class List extends AbstractJavaToKotlinConverterTest { + public static class List extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInList() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/list"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/list"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ForEach.java") public void testForEach() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/list/ForEach.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/list/ForEach.java"); doTest(fileName); } @TestMetadata("Lists.java") public void testLists() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/list/Lists.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/list/Lists.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/literalExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/literalExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class LiteralExpression extends AbstractJavaToKotlinConverterTest { + public static class LiteralExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInLiteralExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/literalExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/literalExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("char.java") public void testChar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/literalExpression/char.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/literalExpression/char.java"); doTest(fileName); } @TestMetadata("dollarInsideString.java") public void testDollarInsideString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/literalExpression/dollarInsideString.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/literalExpression/dollarInsideString.java"); doTest(fileName); } @TestMetadata("endsWithDFL.java") public void testEndsWithDFL() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/literalExpression/endsWithDFL.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/literalExpression/endsWithDFL.java"); doTest(fileName); } @TestMetadata("hex.java") public void testHex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/literalExpression/hex.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/literalExpression/hex.java"); doTest(fileName); } @TestMetadata("octal.java") public void testOctal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/literalExpression/octal.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/literalExpression/octal.java"); doTest(fileName); } @TestMetadata("trueOrFalse.java") public void testTrueOrFalse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/literalExpression/trueOrFalse.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/literalExpression/trueOrFalse.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/localVariable") + @TestMetadata("j2k/tests/testData/fileOrElement/localVariable") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class LocalVariable extends AbstractJavaToKotlinConverterTest { + public static class LocalVariable extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInLocalVariable() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/localVariable"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/localVariable"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("autoBangBang.java") public void testAutoBangBang() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/autoBangBang.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/localVariable/autoBangBang.java"); doTest(fileName); } @TestMetadata("conversion.java") public void testConversion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/conversion.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/localVariable/conversion.java"); doTest(fileName); } @TestMetadata("literalConversion.java") public void testLiteralConversion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/literalConversion.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/localVariable/literalConversion.java"); doTest(fileName); } @TestMetadata("nullIInitializer.java") public void testNullIInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/nullIInitializer.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/localVariable/nullIInitializer.java"); doTest(fileName); } @TestMetadata("object.java") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/object.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/localVariable/object.java"); doTest(fileName); } @TestMetadata("unboxing.java") public void testUnboxing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/unboxing.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/localVariable/unboxing.java"); doTest(fileName); } @TestMetadata("valTypeDoNotMatch.java") public void testValTypeDoNotMatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/valTypeDoNotMatch.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/localVariable/valTypeDoNotMatch.java"); doTest(fileName); } @TestMetadata("varTypeDoNotMatch.java") public void testVarTypeDoNotMatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/varTypeDoNotMatch.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/localVariable/varTypeDoNotMatch.java"); doTest(fileName); } @TestMetadata("varWithNoInitializer.java") public void testVarWithNoInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/varWithNoInitializer.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/localVariable/varWithNoInitializer.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/methodCallExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/methodCallExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodCallExpression extends AbstractJavaToKotlinConverterTest { + public static class MethodCallExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInMethodCallExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/methodCallExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/methodCallExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("callWithKeywords.java") public void testCallWithKeywords() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/callWithKeywords.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/methodCallExpression/callWithKeywords.java"); doTest(fileName); } @TestMetadata("collectionsMethods.java") public void testCollectionsMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/collectionsMethods.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/methodCallExpression/collectionsMethods.java"); doTest(fileName); } @TestMetadata("collectionsMethods2.java") public void testCollectionsMethods2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/collectionsMethods2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/methodCallExpression/collectionsMethods2.java"); doTest(fileName); } @TestMetadata("emptyCall.java") public void testEmptyCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/emptyCall.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/methodCallExpression/emptyCall.java"); doTest(fileName); } @TestMetadata("genericMethod.java") public void testGenericMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/genericMethod.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/methodCallExpression/genericMethod.java"); doTest(fileName); } @TestMetadata("getClass.java") public void testGetClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/getClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/methodCallExpression/getClass.java"); doTest(fileName); } @TestMetadata("simpleCall.java") public void testSimpleCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/simpleCall.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/methodCallExpression/simpleCall.java"); doTest(fileName); } @TestMetadata("vararg1.java") public void testVararg1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/vararg1.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/methodCallExpression/vararg1.java"); doTest(fileName); } @TestMetadata("vararg2.java") public void testVararg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/vararg2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/methodCallExpression/vararg2.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/misc") + @TestMetadata("j2k/tests/testData/fileOrElement/misc") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Misc extends AbstractJavaToKotlinConverterTest { + public static class Misc extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInMisc() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/misc"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/misc"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("packageWithClass.java") public void testPackageWithClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/misc/packageWithClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/misc/packageWithClass.java"); doTest(fileName); } @TestMetadata("packageWithClasses.java") public void testPackageWithClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/misc/packageWithClasses.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/misc/packageWithClasses.java"); doTest(fileName); } @TestMetadata("packageWithImports.java") public void testPackageWithImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/misc/packageWithImports.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/misc/packageWithImports.java"); doTest(fileName); } @TestMetadata("packageWithMixedImports.java") public void testPackageWithMixedImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/misc/packageWithMixedImports.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/misc/packageWithMixedImports.java"); doTest(fileName); } @TestMetadata("packageWithOpenClass.java") public void testPackageWithOpenClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/misc/packageWithOpenClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/misc/packageWithOpenClass.java"); doTest(fileName); } @TestMetadata("packageWithStaticImports.java") public void testPackageWithStaticImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/misc/packageWithStaticImports.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/misc/packageWithStaticImports.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/newClassExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/newClassExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NewClassExpression extends AbstractJavaToKotlinConverterTest { + public static class NewClassExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInNewClassExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/newClassExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/newClassExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classWithParam.java") public void testClassWithParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/classWithParam.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/classWithParam.java"); doTest(fileName); } @TestMetadata("classWithParams.java") public void testClassWithParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/classWithParams.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/classWithParams.java"); doTest(fileName); } @TestMetadata("classWithoutBody.java") public void testClassWithoutBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/classWithoutBody.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/classWithoutBody.java"); doTest(fileName); } @TestMetadata("fullQualifiedName.java") public void testFullQualifiedName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/fullQualifiedName.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/fullQualifiedName.java"); doTest(fileName); } @TestMetadata("fullQualifiedName2.java") public void testFullQualifiedName2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/fullQualifiedName2.java"); doTest(fileName); } @TestMetadata("genericClassInvocation.java") public void testGenericClassInvocation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/genericClassInvocation.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/genericClassInvocation.java"); doTest(fileName); } @TestMetadata("newAnonymousClass.java") public void testNewAnonymousClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/newAnonymousClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/newAnonymousClass.java"); doTest(fileName); } @TestMetadata("newAnonymousClass2.java") public void testNewAnonymousClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/newAnonymousClass2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/newAnonymousClass2.java"); doTest(fileName); } @TestMetadata("newAnonymousClass3.java") public void testNewAnonymousClass3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/newAnonymousClass3.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/newAnonymousClass3.java"); doTest(fileName); } @TestMetadata("newClassByFullName.java") public void testNewClassByFullName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/newClassByFullName.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/newClassByFullName.java"); doTest(fileName); } @TestMetadata("newInnerClass.java") public void testNewInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/newInnerClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/newInnerClass.java"); doTest(fileName); } @TestMetadata("newListAndNewMember.java") public void testNewListAndNewMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/newListAndNewMember.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/newListAndNewMember.java"); doTest(fileName); } @TestMetadata("newStaticInnerClass.java") public void testNewStaticInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/newClassExpression/newStaticInnerClass.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/nullability") + @TestMetadata("j2k/tests/testData/fileOrElement/nullability") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Nullability extends AbstractJavaToKotlinConverterTest { + public static class Nullability extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInNullability() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/nullability"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/nullability"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("autoNotNull.java") public void testAutoNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/autoNotNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/autoNotNull.java"); doTest(fileName); } @TestMetadata("FieldAssignedWithNull.java") public void testFieldAssignedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/FieldAssignedWithNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/FieldAssignedWithNull.java"); doTest(fileName); } @TestMetadata("FieldComparedWithNull.java") public void testFieldComparedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/FieldComparedWithNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull.java"); doTest(fileName); } @TestMetadata("FieldComparedWithNull2.java") public void testFieldComparedWithNull2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/FieldComparedWithNull2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull2.java"); doTest(fileName); } @TestMetadata("FieldComparedWithNull3.java") public void testFieldComparedWithNull3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/FieldComparedWithNull3.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull3.java"); doTest(fileName); } @TestMetadata("FieldComparedWithNull4.java") public void testFieldComparedWithNull4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/FieldComparedWithNull4.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull4.java"); doTest(fileName); } @TestMetadata("FieldInitializedWithNull.java") public void testFieldInitializedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/FieldInitializedWithNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/FieldInitializedWithNull.java"); doTest(fileName); } @TestMetadata("IndirectOverride.java") public void testIndirectOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/IndirectOverride.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/IndirectOverride.java"); doTest(fileName); } @TestMetadata("MethodInvokedWithNullArg.java") public void testMethodInvokedWithNullArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodInvokedWithNullArg.java"); doTest(fileName); } @TestMetadata("MethodInvokedWithNullArg2.java") public void testMethodInvokedWithNullArg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.java"); doTest(fileName); } @TestMetadata("MethodInvokedWithTernaryNullArg.java") public void testMethodInvokedWithTernaryNullArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodInvokedWithTernaryNullArg.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.java"); doTest(fileName); } @TestMetadata("MethodResultComparedWithNull.java") public void testMethodResultComparedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodResultComparedWithNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull.java"); doTest(fileName); } @TestMetadata("MethodResultComparedWithNull2.java") public void testMethodResultComparedWithNull2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodResultComparedWithNull2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull2.java"); doTest(fileName); } @TestMetadata("MethodResultComparedWithNull3.java") public void testMethodResultComparedWithNull3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodResultComparedWithNull3.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull3.java"); doTest(fileName); } @TestMetadata("MethodResultComparedWithNull4.java") public void testMethodResultComparedWithNull4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodResultComparedWithNull4.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull4.java"); doTest(fileName); } @TestMetadata("MethodResultInitializesNullableField.java") public void testMethodResultInitializesNullableField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodResultInitializesNullableField.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodResultInitializesNullableField.java"); doTest(fileName); } @TestMetadata("MethodReturnsNull.java") public void testMethodReturnsNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodReturnsNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodReturnsNull.java"); doTest(fileName); } @TestMetadata("MethodReturnsNullInAnonymousClass.java") public void testMethodReturnsNullInAnonymousClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodReturnsNullInAnonymousClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.java"); doTest(fileName); } @TestMetadata("MethodReturnsNullInLocalClass.java") public void testMethodReturnsNullInLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodReturnsNullInLocalClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodReturnsNullInLocalClass.java"); doTest(fileName); } @TestMetadata("MethodReturnsTernaryNull.java") public void testMethodReturnsTernaryNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodReturnsTernaryNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/MethodReturnsTernaryNull.java"); doTest(fileName); } @TestMetadata("NullableIntNoCrash.java") public void testNullableIntNoCrash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/NullableIntNoCrash.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/NullableIntNoCrash.java"); doTest(fileName); } @TestMetadata("NullableMethodDotAccess.java") public void testNullableMethodDotAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/NullableMethodDotAccess.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/NullableMethodDotAccess.java"); doTest(fileName); } @TestMetadata("NullableVariableDotAccess.java") public void testNullableVariableDotAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/NullableVariableDotAccess.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/NullableVariableDotAccess.java"); doTest(fileName); } @TestMetadata("OverrideWithInheritanceLoop.java") public void testOverrideWithInheritanceLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/OverrideWithInheritanceLoop.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/OverrideWithInheritanceLoop.java"); doTest(fileName); } @TestMetadata("Overrides.java") public void testOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/Overrides.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/Overrides.java"); doTest(fileName); } @TestMetadata("ParameterComparedWithNull.java") public void testParameterComparedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/ParameterComparedWithNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/ParameterComparedWithNull.java"); doTest(fileName); } @TestMetadata("VariableAssignedWithNull.java") public void testVariableAssignedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/VariableAssignedWithNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/VariableAssignedWithNull.java"); doTest(fileName); } @TestMetadata("VariableComparedWithNull.java") public void testVariableComparedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/VariableComparedWithNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/VariableComparedWithNull.java"); doTest(fileName); } @TestMetadata("VariableInitializedWithNull.java") public void testVariableInitializedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/VariableInitializedWithNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/VariableInitializedWithNull.java"); doTest(fileName); } @TestMetadata("VariableInitializedWithTernaryNull.java") public void testVariableInitializedWithTernaryNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/VariableInitializedWithTernaryNull.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/objectLiteral") + @TestMetadata("j2k/tests/testData/fileOrElement/objectLiteral") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ObjectLiteral extends AbstractJavaToKotlinConverterTest { + public static class ObjectLiteral extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInObjectLiteral() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/objectLiteral"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/objectLiteral"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("MyFrame.java") public void testMyFrame() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/objectLiteral/MyFrame.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/objectLiteral/MyFrame.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/outProjectionType") + @TestMetadata("j2k/tests/testData/fileOrElement/outProjectionType") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class OutProjectionType extends AbstractJavaToKotlinConverterTest { + public static class OutProjectionType extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInOutProjectionType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/outProjectionType"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/outProjectionType"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("methodParams.java") public void testMethodParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/outProjectionType/methodParams.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/outProjectionType/methodParams.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/packageStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/packageStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PackageStatement extends AbstractJavaToKotlinConverterTest { + public static class PackageStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInPackageStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/packageStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/packageStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("orgJetbrainsJetJ2kIn.java") public void testOrgJetbrainsJetJ2kIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/packageStatement/orgJetbrainsJetJ2kIn.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/parenthesizedExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/parenthesizedExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ParenthesizedExpression extends AbstractJavaToKotlinConverterTest { + public static class ParenthesizedExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInParenthesizedExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/parenthesizedExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/parenthesizedExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("parenthesized.java") public void testParenthesized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/parenthesizedExpression/parenthesized.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/parenthesizedExpression/parenthesized.java"); doTest(fileName); } @TestMetadata("parenthesized2.java") public void testParenthesized2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/parenthesizedExpression/parenthesized2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/parenthesizedExpression/parenthesized2.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/polyadicExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/polyadicExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PolyadicExpression extends AbstractJavaToKotlinConverterTest { + public static class PolyadicExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInPolyadicExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/polyadicExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/polyadicExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("divide.java") public void testDivide() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/polyadicExpression/divide.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/polyadicExpression/divide.java"); doTest(fileName); } @TestMetadata("minus.java") public void testMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/polyadicExpression/minus.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/polyadicExpression/minus.java"); doTest(fileName); } @TestMetadata("multiply.java") public void testMultiply() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/polyadicExpression/multiply.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/polyadicExpression/multiply.java"); doTest(fileName); } @TestMetadata("plus.java") public void testPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/polyadicExpression/plus.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/polyadicExpression/plus.java"); doTest(fileName); } @TestMetadata("remainder.java") public void testRemainder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/polyadicExpression/remainder.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/polyadicExpression/remainder.java"); doTest(fileName); } @TestMetadata("unassignedShiftRight.java") public void testUnassignedShiftRight() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/polyadicExpression/unassignedShiftRight.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/polyadicExpression/unassignedShiftRight.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/postfixOperator") + @TestMetadata("j2k/tests/testData/fileOrElement/postfixOperator") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PostfixOperator extends AbstractJavaToKotlinConverterTest { + public static class PostfixOperator extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInPostfixOperator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/postfixOperator"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/postfixOperator"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("decrement.java") public void testDecrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/postfixOperator/decrement.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/postfixOperator/decrement.java"); doTest(fileName); } @TestMetadata("increment.java") public void testIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/postfixOperator/increment.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/postfixOperator/increment.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/prefixOperator") + @TestMetadata("j2k/tests/testData/fileOrElement/prefixOperator") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PrefixOperator extends AbstractJavaToKotlinConverterTest { + public static class PrefixOperator extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInPrefixOperator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/prefixOperator"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/prefixOperator"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("decrement.java") public void testDecrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/prefixOperator/decrement.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/prefixOperator/decrement.java"); doTest(fileName); } @TestMetadata("excl.java") public void testExcl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/prefixOperator/excl.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/prefixOperator/excl.java"); doTest(fileName); } @TestMetadata("increment.java") public void testIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/prefixOperator/increment.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/prefixOperator/increment.java"); doTest(fileName); } @TestMetadata("kt-667.java") public void testKt_667() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/prefixOperator/kt-667.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/prefixOperator/kt-667.java"); doTest(fileName); } @TestMetadata("nullableIf.java") public void testNullableIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/prefixOperator/nullableIf.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/prefixOperator/nullableIf.java"); doTest(fileName); } @TestMetadata("tilde.java") public void testTilde() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/prefixOperator/tilde.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/prefixOperator/tilde.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/rawGenerics") + @TestMetadata("j2k/tests/testData/fileOrElement/rawGenerics") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class RawGenerics extends AbstractJavaToKotlinConverterTest { + public static class RawGenerics extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInRawGenerics() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/rawGenerics"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/rawGenerics"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("kt-540.java") public void testKt_540() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/rawGenerics/kt-540.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/rawGenerics/kt-540.java"); doTest(fileName); } @TestMetadata("kt-540-map.java") public void testKt_540_map() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/rawGenerics/kt-540-map.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/rawGenerics/kt-540-map.java"); doTest(fileName); } @TestMetadata("kt-540-rawGenericClass.java") public void testKt_540_rawGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.java"); doTest(fileName); } @TestMetadata("rawGenericMethod.java") public void testRawGenericMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/rawGenerics/rawGenericMethod.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/rawGenerics/rawGenericMethod.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/returnStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/returnStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ReturnStatement extends AbstractJavaToKotlinConverterTest { + public static class ReturnStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInReturnStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/returnStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/returnStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("currentMethodBug.java") public void testCurrentMethodBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/returnStatement/currentMethodBug.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/returnStatement/currentMethodBug.java"); doTest(fileName); } @TestMetadata("returnChar.java") public void testReturnChar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/returnStatement/returnChar.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/returnStatement/returnChar.java"); doTest(fileName); } @TestMetadata("returnLiteral.java") public void testReturnLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/returnStatement/returnLiteral.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/returnStatement/returnLiteral.java"); doTest(fileName); } @TestMetadata("returnNumber.java") public void testReturnNumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/returnStatement/returnNumber.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/returnStatement/returnNumber.java"); doTest(fileName); } @TestMetadata("returnString.java") public void testReturnString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/returnStatement/returnString.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/returnStatement/returnString.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/settings") + @TestMetadata("j2k/tests/testData/fileOrElement/settings") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Settings extends AbstractJavaToKotlinConverterTest { + public static class Settings extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInSettings() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/settings"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/settings"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("openByDefault.java") public void testOpenByDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/settings/openByDefault.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/settings/openByDefault.java"); doTest(fileName); } @TestMetadata("specifyFieldTypeByDefault.java") public void testSpecifyFieldTypeByDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/settings/specifyFieldTypeByDefault.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/settings/specifyFieldTypeByDefault.java"); doTest(fileName); } @TestMetadata("specifyLocalVariableTypeByDefault.java") public void testSpecifyLocalVariableTypeByDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/settings/specifyLocalVariableTypeByDefault.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.java"); doTest(fileName); } @TestMetadata("specifyLocalVariableTypeByDefaultInFor.java") public void testSpecifyLocalVariableTypeByDefaultInFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/settings/specifyLocalVariableTypeByDefaultInFor.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/starProjectionType") + @TestMetadata("j2k/tests/testData/fileOrElement/starProjectionType") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class StarProjectionType extends AbstractJavaToKotlinConverterTest { + public static class StarProjectionType extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInStarProjectionType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/starProjectionType"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/starProjectionType"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("methodParams.java") public void testMethodParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/starProjectionType/methodParams.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/starProjectionType/methodParams.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/staticMembers") + @TestMetadata("j2k/tests/testData/fileOrElement/staticMembers") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class StaticMembers extends AbstractJavaToKotlinConverterTest { + public static class StaticMembers extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInStaticMembers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/staticMembers"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/staticMembers"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("PrivateStaticMembers.java") public void testPrivateStaticMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/staticMembers/PrivateStaticMembers.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMembers.java"); doTest(fileName); } @TestMetadata("PrivateStaticMethods1.java") public void testPrivateStaticMethods1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/staticMembers/PrivateStaticMethods1.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods1.java"); doTest(fileName); } @TestMetadata("PrivateStaticMethods2.java") public void testPrivateStaticMethods2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/staticMembers/PrivateStaticMethods2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods2.java"); doTest(fileName); } @TestMetadata("PrivateStaticMethods3.java") public void testPrivateStaticMethods3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/staticMembers/PrivateStaticMethods3.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods3.java"); doTest(fileName); } @TestMetadata("PrivateStaticMethods4.java") public void testPrivateStaticMethods4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/staticMembers/PrivateStaticMethods4.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods4.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/superExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/superExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SuperExpression extends AbstractJavaToKotlinConverterTest { + public static class SuperExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInSuperExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/superExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/superExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classAdotSuperFoo.java") public void testClassAdotSuperFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/superExpression/classAdotSuperFoo.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/superExpression/classAdotSuperFoo.java"); doTest(fileName); } @TestMetadata("classAextendsB.java") public void testClassAextendsB() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/superExpression/classAextendsB.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/superExpression/classAextendsB.java"); doTest(fileName); } @TestMetadata("superStatement.java") public void testSuperStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/superExpression/superStatement.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/superExpression/superStatement.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/switch") + @TestMetadata("j2k/tests/testData/fileOrElement/switch") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Switch extends AbstractJavaToKotlinConverterTest { + public static class Switch extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInSwitch() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/switch"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/switch"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("caseWithBlock.java") public void testCaseWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/caseWithBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/switch/caseWithBlock.java"); doTest(fileName); } @TestMetadata("comlicatedFallDown.java") public void testComlicatedFallDown() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/comlicatedFallDown.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/switch/comlicatedFallDown.java"); doTest(fileName); } @TestMetadata("continueAndBreakWithLabel.java") public void testContinueAndBreakWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/continueAndBreakWithLabel.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/switch/continueAndBreakWithLabel.java"); doTest(fileName); } @TestMetadata("emptySwitch.java") public void testEmptySwitch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/emptySwitch.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/switch/emptySwitch.java"); doTest(fileName); } @TestMetadata("enumConstants.java") public void testEnumConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/enumConstants.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/switch/enumConstants.java"); doTest(fileName); } @TestMetadata("fallDown.java") public void testFallDown() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/fallDown.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/switch/fallDown.java"); doTest(fileName); } @TestMetadata("fallDownWithBlocks.java") public void testFallDownWithBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/fallDownWithBlocks.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/switch/fallDownWithBlocks.java"); doTest(fileName); } @TestMetadata("invalidSwitch.java") public void testInvalidSwitch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/invalidSwitch.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/switch/invalidSwitch.java"); doTest(fileName); } @TestMetadata("kt-539.java") public void testKt_539() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/kt-539.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/switch/kt-539.java"); doTest(fileName); } @TestMetadata("nondefault.java") public void testNondefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/nondefault.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/switch/nondefault.java"); doTest(fileName); } @TestMetadata("returnsAndThrows.java") public void testReturnsAndThrows() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/returnsAndThrows.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/switch/returnsAndThrows.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/synchronizedStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/synchronizedStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SynchronizedStatement extends AbstractJavaToKotlinConverterTest { + public static class SynchronizedStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInSynchronizedStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/synchronizedStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/synchronizedStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("singleLineExample.java") public void testSingleLineExample() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/synchronizedStatement/singleLineExample.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/synchronizedStatement/singleLineExample.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/thisExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/thisExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ThisExpression extends AbstractJavaToKotlinConverterTest { + public static class ThisExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInThisExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/thisExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/thisExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classAdotThisFoo.java") public void testClassAdotThisFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/thisExpression/classAdotThisFoo.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/thisExpression/classAdotThisFoo.java"); doTest(fileName); } @TestMetadata("thisStatement.java") public void testThisStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/thisExpression/thisStatement.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/thisExpression/thisStatement.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/throwStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/throwStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ThrowStatement extends AbstractJavaToKotlinConverterTest { + public static class ThrowStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInThrowStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/throwStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/throwStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("simpleThrowStatement.java") public void testSimpleThrowStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/throwStatement/simpleThrowStatement.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/throwStatement/simpleThrowStatement.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/toKotlinClasses") + @TestMetadata("j2k/tests/testData/fileOrElement/toKotlinClasses") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ToKotlinClasses extends AbstractJavaToKotlinConverterTest { + public static class ToKotlinClasses extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInToKotlinClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/toKotlinClasses"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/toKotlinClasses"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("iterableAndIterator.java") public void testIterableAndIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/toKotlinClasses/iterableAndIterator.java"); doTest(fileName); } @TestMetadata("iterableAndIterator2.java") public void testIterableAndIterator2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.java"); doTest(fileName); } @TestMetadata("iterableAndIterator3.java") public void testIterableAndIterator3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator3.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.java"); doTest(fileName); } @TestMetadata("TypeParameterBound.java") public void testTypeParameterBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/toKotlinClasses/TypeParameterBound.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/toKotlinClasses/TypeParameterBound.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/trait") + @TestMetadata("j2k/tests/testData/fileOrElement/trait") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Trait extends AbstractJavaToKotlinConverterTest { + public static class Trait extends AbstractJavaToKotlinConverterSingleFileTest { @TestMetadata("abstactInterface.java") public void testAbstactInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/abstactInterface.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/trait/abstactInterface.java"); doTest(fileName); } public void testAllFilesPresentInTrait() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/trait"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/trait"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("emptyInterface.java") public void testEmptyInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/emptyInterface.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/trait/emptyInterface.java"); doTest(fileName); } @TestMetadata("extendsOneClassAndImplementsSeveralInterfaces.java") public void testExtendsOneClassAndImplementsSeveralInterfaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/trait/extendsOneClassAndImplementsSeveralInterfaces.java"); doTest(fileName); } @TestMetadata("extendsOneInterface.java") public void testExtendsOneInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/extendsOneInterface.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/trait/extendsOneInterface.java"); doTest(fileName); } @TestMetadata("interfaceWithFields.java") public void testInterfaceWithFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/interfaceWithFields.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/trait/interfaceWithFields.java"); doTest(fileName); } @TestMetadata("interfaceWithMethodDeclaration.java") public void testInterfaceWithMethodDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/trait/interfaceWithMethodDeclaration.java"); doTest(fileName); } @TestMetadata("interfaceWithStaticFields.java") public void testInterfaceWithStaticFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/interfaceWithStaticFields.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/trait/interfaceWithStaticFields.java"); doTest(fileName); } @TestMetadata("internalInterface.java") public void testInternalInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/internalInterface.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/trait/internalInterface.java"); doTest(fileName); } @TestMetadata("privateInterface.java") public void testPrivateInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/privateInterface.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/trait/privateInterface.java"); doTest(fileName); } @TestMetadata("protectedInterface.java") public void testProtectedInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/protectedInterface.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/trait/protectedInterface.java"); doTest(fileName); } @TestMetadata("publicInterface.java") public void testPublicInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/publicInterface.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/trait/publicInterface.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/tryStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/tryStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TryStatement extends AbstractJavaToKotlinConverterTest { + public static class TryStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInTryStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/tryStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/tryStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("commonCaseForTryStatement.java") public void testCommonCaseForTryStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryStatement/commonCaseForTryStatement.java"); doTest(fileName); } @TestMetadata("disjunctionType.java") public void testDisjunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryStatement/disjunctionType.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryStatement/disjunctionType.java"); doTest(fileName); } @TestMetadata("emptyTryWithTwoCatchesWithEmptyFinally.java") public void testEmptyTryWithTwoCatchesWithEmptyFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.java"); doTest(fileName); } @TestMetadata("emptyTryWithTwoCatchesWithFinally.java") public void testEmptyTryWithTwoCatchesWithFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithFinally.java"); doTest(fileName); } @TestMetadata("emptyTryWithTwoCatchesWithoutFinally.java") public void testEmptyTryWithTwoCatchesWithoutFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithoutFinally.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/tryWithResource") + @TestMetadata("j2k/tests/testData/fileOrElement/tryWithResource") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TryWithResource extends AbstractJavaToKotlinConverterTest { + public static class TryWithResource extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInTryWithResource() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/tryWithResource"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/tryWithResource"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("Multiline.java") public void testMultiline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/Multiline.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryWithResource/Multiline.java"); doTest(fileName); } @TestMetadata("MultipleResources.java") public void testMultipleResources() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/MultipleResources.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryWithResource/MultipleResources.java"); doTest(fileName); } @TestMetadata("Simple.java") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/Simple.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryWithResource/Simple.java"); doTest(fileName); } @TestMetadata("WithCatch.java") public void testWithCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/WithCatch.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryWithResource/WithCatch.java"); doTest(fileName); } @TestMetadata("WithCatchAndFinally.java") public void testWithCatchAndFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/WithCatchAndFinally.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryWithResource/WithCatchAndFinally.java"); doTest(fileName); } @TestMetadata("WithCatches.java") public void testWithCatches() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/WithCatches.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryWithResource/WithCatches.java"); doTest(fileName); } @TestMetadata("WithFinally.java") public void testWithFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/WithFinally.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryWithResource/WithFinally.java"); doTest(fileName); } @TestMetadata("WithReturnAtEnd.java") public void testWithReturnAtEnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/WithReturnAtEnd.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryWithResource/WithReturnAtEnd.java"); doTest(fileName); } @TestMetadata("WithReturnInAnonymousClass.java") public void testWithReturnInAnonymousClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass.java"); doTest(fileName); } @TestMetadata("WithReturnInAnonymousClass2.java") public void testWithReturnInAnonymousClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass2.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass2.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/typeCastExpression") + @TestMetadata("j2k/tests/testData/fileOrElement/typeCastExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TypeCastExpression extends AbstractJavaToKotlinConverterTest { + public static class TypeCastExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInTypeCastExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/typeCastExpression"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/typeCastExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("extendsWildcardCast.java") public void testExtendsWildcardCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeCastExpression/extendsWildcardCast.java"); doTest(fileName); } @TestMetadata("fooCast.java") public void testFooCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/fooCast.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeCastExpression/fooCast.java"); doTest(fileName); } @TestMetadata("intCast.java") public void testIntCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/intCast.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeCastExpression/intCast.java"); doTest(fileName); } @TestMetadata("primitiveType.java") public void testPrimitiveType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/primitiveType.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeCastExpression/primitiveType.java"); doTest(fileName); } @TestMetadata("simpleGenericCast.java") public void testSimpleGenericCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeCastExpression/simpleGenericCast.java"); doTest(fileName); } @TestMetadata("stringCast.java") public void testStringCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/stringCast.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeCastExpression/stringCast.java"); doTest(fileName); } @TestMetadata("superWildcardCast.java") public void testSuperWildcardCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/superWildcardCast.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeCastExpression/superWildcardCast.java"); doTest(fileName); } @TestMetadata("wildcardCast.java") public void testWildcardCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/wildcardCast.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeCastExpression/wildcardCast.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/typeParameters") + @TestMetadata("j2k/tests/testData/fileOrElement/typeParameters") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TypeParameters extends AbstractJavaToKotlinConverterTest { + public static class TypeParameters extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInTypeParameters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/typeParameters"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/typeParameters"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classDoubleParametrizationWithTwoBoundsWithExtending.java") public void testClassDoubleParametrizationWithTwoBoundsWithExtending() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.java"); doTest(fileName); } @TestMetadata("classParametrizationWithTwoBounds.java") public void testClassParametrizationWithTwoBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/classParametrizationWithTwoBounds.java"); doTest(fileName); } @TestMetadata("classParametrizationWithTwoBoundsWithExtending.java") public void testClassParametrizationWithTwoBoundsWithExtending() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/classParametrizationWithTwoBoundsWithExtending.java"); doTest(fileName); } @TestMetadata("complexExampleWithClassExtending.java") public void testComplexExampleWithClassExtending() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/complexExampleWithClassExtending.java"); doTest(fileName); } @TestMetadata("complexExampleWithClassMultiplyExtending.java") public void testComplexExampleWithClassMultiplyExtending() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/complexExampleWithClassMultiplyExtending.java"); doTest(fileName); } @TestMetadata("genericClass.java") public void testGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/genericClass.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/genericClass.java"); doTest(fileName); } @TestMetadata("genericParam.java") public void testGenericParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/genericParam.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/genericParam.java"); doTest(fileName); } @TestMetadata("genericParam-settings.java") public void testGenericParam_settings() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/genericParam-settings.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/genericParam-settings.java"); doTest(fileName); } @TestMetadata("manyGenericParams.java") public void testManyGenericParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/manyGenericParams.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/manyGenericParams.java"); doTest(fileName); } @TestMetadata("methodDoubleParametrizationWithTwoBounds.java") public void testMethodDoubleParametrizationWithTwoBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/methodDoubleParametrizationWithTwoBounds.java"); doTest(fileName); } @TestMetadata("needTypeArgs.java") public void testNeedTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/needTypeArgs.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/needTypeArgs.java"); doTest(fileName); } @TestMetadata("rawTypeCast.java") public void testRawTypeCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/rawTypeCast.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/rawTypeCast.java"); doTest(fileName); } @TestMetadata("traitDoubleParametrizationWithTwoBoundsWithExtending.java") public void testTraitDoubleParametrizationWithTwoBoundsWithExtending() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.java"); doTest(fileName); } @TestMetadata("typeFromOtherFile.java") public void testTypeFromOtherFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/typeFromOtherFile.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/typeFromOtherFile.java"); doTest(fileName); } @TestMetadata("where.java") public void testWhere() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/where.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/typeParameters/where.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/varArg") + @TestMetadata("j2k/tests/testData/fileOrElement/varArg") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class VarArg extends AbstractJavaToKotlinConverterTest { + public static class VarArg extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInVarArg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/varArg"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/varArg"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ellipsisTypeSeveralParams.java") public void testEllipsisTypeSeveralParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/varArg/ellipsisTypeSeveralParams.java"); doTest(fileName); } @TestMetadata("ellipsisTypeSingleParams.java") public void testEllipsisTypeSingleParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/varArg/ellipsisTypeSingleParams.java"); doTest(fileName); } } - @TestMetadata("j2k/tests/testData/ast/whileStatement") + @TestMetadata("j2k/tests/testData/fileOrElement/whileStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class WhileStatement extends AbstractJavaToKotlinConverterTest { + public static class WhileStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInWhileStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/whileStatement"), Pattern.compile("^(.+)\\.java$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/fileOrElement/whileStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("whileWithBlock.java") public void testWhileWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/whileStatement/whileWithBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/whileStatement/whileWithBlock.java"); doTest(fileName); } @TestMetadata("whileWithEmptyBlock.java") public void testWhileWithEmptyBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/whileStatement/whileWithEmptyBlock.java"); doTest(fileName); } @TestMetadata("whileWithExpression.java") public void testWhileWithExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/whileStatement/whileWithExpression.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/whileStatement/whileWithExpression.java"); doTest(fileName); } @TestMetadata("whileWithReturn.java") public void testWhileWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/whileStatement/whileWithReturn.java"); + String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/fileOrElement/whileStatement/whileWithReturn.java"); doTest(fileName); } } diff --git a/j2k/tests/testData/ast/annotations/annotationInterface1.java b/j2k/tests/testData/fileOrElement/annotations/annotationInterface1.java similarity index 100% rename from j2k/tests/testData/ast/annotations/annotationInterface1.java rename to j2k/tests/testData/fileOrElement/annotations/annotationInterface1.java diff --git a/j2k/tests/testData/ast/annotations/annotationInterface1.kt b/j2k/tests/testData/fileOrElement/annotations/annotationInterface1.kt similarity index 100% rename from j2k/tests/testData/ast/annotations/annotationInterface1.kt rename to j2k/tests/testData/fileOrElement/annotations/annotationInterface1.kt diff --git a/j2k/tests/testData/ast/annotations/annotationInterface2.java b/j2k/tests/testData/fileOrElement/annotations/annotationInterface2.java similarity index 100% rename from j2k/tests/testData/ast/annotations/annotationInterface2.java rename to j2k/tests/testData/fileOrElement/annotations/annotationInterface2.java diff --git a/j2k/tests/testData/ast/annotations/annotationInterface2.kt b/j2k/tests/testData/fileOrElement/annotations/annotationInterface2.kt similarity index 100% rename from j2k/tests/testData/ast/annotations/annotationInterface2.kt rename to j2k/tests/testData/fileOrElement/annotations/annotationInterface2.kt diff --git a/j2k/tests/testData/ast/annotations/annotationInterface3.java b/j2k/tests/testData/fileOrElement/annotations/annotationInterface3.java similarity index 100% rename from j2k/tests/testData/ast/annotations/annotationInterface3.java rename to j2k/tests/testData/fileOrElement/annotations/annotationInterface3.java diff --git a/j2k/tests/testData/ast/annotations/annotationInterface3.kt b/j2k/tests/testData/fileOrElement/annotations/annotationInterface3.kt similarity index 100% rename from j2k/tests/testData/ast/annotations/annotationInterface3.kt rename to j2k/tests/testData/fileOrElement/annotations/annotationInterface3.kt diff --git a/j2k/tests/testData/ast/annotations/annotationUsages.java b/j2k/tests/testData/fileOrElement/annotations/annotationUsages.java similarity index 100% rename from j2k/tests/testData/ast/annotations/annotationUsages.java rename to j2k/tests/testData/fileOrElement/annotations/annotationUsages.java diff --git a/j2k/tests/testData/ast/annotations/annotationUsages.kt b/j2k/tests/testData/fileOrElement/annotations/annotationUsages.kt similarity index 100% rename from j2k/tests/testData/ast/annotations/annotationUsages.kt rename to j2k/tests/testData/fileOrElement/annotations/annotationUsages.kt diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.java b/j2k/tests/testData/fileOrElement/annotations/jetbrainsNotNull.java similarity index 100% rename from j2k/tests/testData/ast/annotations/jetbrainsNotNull.java rename to j2k/tests/testData/fileOrElement/annotations/jetbrainsNotNull.java diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.kt b/j2k/tests/testData/fileOrElement/annotations/jetbrainsNotNull.kt similarity index 100% rename from j2k/tests/testData/ast/annotations/jetbrainsNotNull.kt rename to j2k/tests/testData/fileOrElement/annotations/jetbrainsNotNull.kt diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.java b/j2k/tests/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.java similarity index 100% rename from j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.java rename to j2k/tests/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.java diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt b/j2k/tests/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.kt similarity index 100% rename from j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt rename to j2k/tests/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.kt diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNullable.java b/j2k/tests/testData/fileOrElement/annotations/jetbrainsNullable.java similarity index 100% rename from j2k/tests/testData/ast/annotations/jetbrainsNullable.java rename to j2k/tests/testData/fileOrElement/annotations/jetbrainsNullable.java diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNullable.kt b/j2k/tests/testData/fileOrElement/annotations/jetbrainsNullable.kt similarity index 100% rename from j2k/tests/testData/ast/annotations/jetbrainsNullable.kt rename to j2k/tests/testData/fileOrElement/annotations/jetbrainsNullable.kt diff --git a/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.java b/j2k/tests/testData/fileOrElement/anonymousBlock/oneAnonBlock.java similarity index 100% rename from j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.java rename to j2k/tests/testData/fileOrElement/anonymousBlock/oneAnonBlock.java diff --git a/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.kt b/j2k/tests/testData/fileOrElement/anonymousBlock/oneAnonBlock.kt similarity index 100% rename from j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.kt rename to j2k/tests/testData/fileOrElement/anonymousBlock/oneAnonBlock.kt diff --git a/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.java b/j2k/tests/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.java similarity index 100% rename from j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.java rename to j2k/tests/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.java diff --git a/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.kt b/j2k/tests/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.kt similarity index 100% rename from j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.kt rename to j2k/tests/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.kt diff --git a/j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.java b/j2k/tests/testData/fileOrElement/arrayAccessExpression/expressionIndex.java similarity index 100% rename from j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.java rename to j2k/tests/testData/fileOrElement/arrayAccessExpression/expressionIndex.java diff --git a/j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.kt b/j2k/tests/testData/fileOrElement/arrayAccessExpression/expressionIndex.kt similarity index 100% rename from j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.kt rename to j2k/tests/testData/fileOrElement/arrayAccessExpression/expressionIndex.kt diff --git a/j2k/tests/testData/ast/arrayAccessExpression/intIndex.java b/j2k/tests/testData/fileOrElement/arrayAccessExpression/intIndex.java similarity index 100% rename from j2k/tests/testData/ast/arrayAccessExpression/intIndex.java rename to j2k/tests/testData/fileOrElement/arrayAccessExpression/intIndex.java diff --git a/j2k/tests/testData/ast/arrayAccessExpression/intIndex.kt b/j2k/tests/testData/fileOrElement/arrayAccessExpression/intIndex.kt similarity index 100% rename from j2k/tests/testData/ast/arrayAccessExpression/intIndex.kt rename to j2k/tests/testData/fileOrElement/arrayAccessExpression/intIndex.kt diff --git a/j2k/tests/testData/ast/arrayAccessExpression/variableIndex.java b/j2k/tests/testData/fileOrElement/arrayAccessExpression/variableIndex.java similarity index 100% rename from j2k/tests/testData/ast/arrayAccessExpression/variableIndex.java rename to j2k/tests/testData/fileOrElement/arrayAccessExpression/variableIndex.java diff --git a/j2k/tests/testData/ast/arrayAccessExpression/variableIndex.kt b/j2k/tests/testData/fileOrElement/arrayAccessExpression/variableIndex.kt similarity index 100% rename from j2k/tests/testData/ast/arrayAccessExpression/variableIndex.kt rename to j2k/tests/testData/fileOrElement/arrayAccessExpression/variableIndex.kt diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.java b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/doubleArray.java similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.java rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/doubleArray.java diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.kt b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/doubleArray.kt similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.kt rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/doubleArray.kt diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.java b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/doubleArrayWithVariables.java similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.java rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/doubleArrayWithVariables.java diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.kt b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/doubleArrayWithVariables.kt similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.kt rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/doubleArrayWithVariables.kt diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/floatArray.java b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/floatArray.java similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/floatArray.java rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/floatArray.java diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/floatArray.kt b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/floatArray.kt similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/floatArray.kt rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/floatArray.kt diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.java b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/intArrayWithLength.java similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.java rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/intArrayWithLength.java diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.kt b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/intArrayWithLength.kt similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.kt rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/intArrayWithLength.kt diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.java b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/javaLangDoubleArray.java similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.java rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/javaLangDoubleArray.java diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.kt b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/javaLangDoubleArray.kt similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.kt rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/javaLangDoubleArray.kt diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.java b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/javaLangFloatArray.java similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.java rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/javaLangFloatArray.java diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.kt b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/javaLangFloatArray.kt similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.kt rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/javaLangFloatArray.kt diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/newByte.java b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/newByte.java similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/newByte.java rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/newByte.java diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/newByte.kt b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/newByte.kt similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/newByte.kt rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/newByte.kt diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/newInt.java b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/newInt.java similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/newInt.java rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/newInt.java diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/newInt.kt b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/newInt.kt similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/newInt.kt rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/newInt.kt diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.java b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/objectArrayWithLength.java similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.java rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/objectArrayWithLength.java diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.kt b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/objectArrayWithLength.kt similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.kt rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/objectArrayWithLength.kt diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/oneDim.java b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/oneDim.java similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/oneDim.java rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/oneDim.java diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/oneDim.kt b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/oneDim.kt similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/oneDim.kt rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/oneDim.kt diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.java b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/oneDimWithVariables.java similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.java rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/oneDimWithVariables.java diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.kt b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/oneDimWithVariables.kt similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.kt rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/oneDimWithVariables.kt diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/twoDim.java b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/twoDim.java similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/twoDim.java rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/twoDim.java diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/twoDim.kt b/j2k/tests/testData/fileOrElement/arrayInitializerExpression/twoDim.kt similarity index 100% rename from j2k/tests/testData/ast/arrayInitializerExpression/twoDim.kt rename to j2k/tests/testData/fileOrElement/arrayInitializerExpression/twoDim.kt diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatement.java b/j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatement.java similarity index 100% rename from j2k/tests/testData/ast/arrayType/arrayInitializationStatement.java rename to j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatement.java diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatement.kt b/j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatement.kt similarity index 100% rename from j2k/tests/testData/ast/arrayType/arrayInitializationStatement.kt rename to j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatement.kt diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.java b/j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension.java similarity index 100% rename from j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.java rename to j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension.java diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.kt b/j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension.kt similarity index 100% rename from j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.kt rename to j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension.kt diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.java b/j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension3d.java similarity index 100% rename from j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.java rename to j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension3d.java diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.kt b/j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension3d.kt similarity index 100% rename from j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.kt rename to j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension3d.kt diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.java b/j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimensionExplicit.java similarity index 100% rename from j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.java rename to j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimensionExplicit.java diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.kt b/j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimensionExplicit.kt similarity index 100% rename from j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.kt rename to j2k/tests/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimensionExplicit.kt diff --git a/j2k/tests/testData/ast/arrayType/d2StringEmptyArray.java b/j2k/tests/testData/fileOrElement/arrayType/d2StringEmptyArray.java similarity index 100% rename from j2k/tests/testData/ast/arrayType/d2StringEmptyArray.java rename to j2k/tests/testData/fileOrElement/arrayType/d2StringEmptyArray.java diff --git a/j2k/tests/testData/ast/arrayType/d2StringEmptyArray.kt b/j2k/tests/testData/fileOrElement/arrayType/d2StringEmptyArray.kt similarity index 100% rename from j2k/tests/testData/ast/arrayType/d2StringEmptyArray.kt rename to j2k/tests/testData/fileOrElement/arrayType/d2StringEmptyArray.kt diff --git a/j2k/tests/testData/ast/arrayType/d3StringEmptyArray.java b/j2k/tests/testData/fileOrElement/arrayType/d3StringEmptyArray.java similarity index 100% rename from j2k/tests/testData/ast/arrayType/d3StringEmptyArray.java rename to j2k/tests/testData/fileOrElement/arrayType/d3StringEmptyArray.java diff --git a/j2k/tests/testData/ast/arrayType/d3StringEmptyArray.kt b/j2k/tests/testData/fileOrElement/arrayType/d3StringEmptyArray.kt similarity index 100% rename from j2k/tests/testData/ast/arrayType/d3StringEmptyArray.kt rename to j2k/tests/testData/fileOrElement/arrayType/d3StringEmptyArray.kt diff --git a/j2k/tests/testData/ast/arrayType/longArray.java b/j2k/tests/testData/fileOrElement/arrayType/longArray.java similarity index 100% rename from j2k/tests/testData/ast/arrayType/longArray.java rename to j2k/tests/testData/fileOrElement/arrayType/longArray.java diff --git a/j2k/tests/testData/ast/arrayType/longArray.kt b/j2k/tests/testData/fileOrElement/arrayType/longArray.kt similarity index 100% rename from j2k/tests/testData/ast/arrayType/longArray.kt rename to j2k/tests/testData/fileOrElement/arrayType/longArray.kt diff --git a/j2k/tests/testData/ast/arrayType/methodArrayArgs.java b/j2k/tests/testData/fileOrElement/arrayType/methodArrayArgs.java similarity index 100% rename from j2k/tests/testData/ast/arrayType/methodArrayArgs.java rename to j2k/tests/testData/fileOrElement/arrayType/methodArrayArgs.java diff --git a/j2k/tests/testData/ast/arrayType/methodArrayArgs.kt b/j2k/tests/testData/fileOrElement/arrayType/methodArrayArgs.kt similarity index 100% rename from j2k/tests/testData/ast/arrayType/methodArrayArgs.kt rename to j2k/tests/testData/fileOrElement/arrayType/methodArrayArgs.kt diff --git a/j2k/tests/testData/ast/arrayType/newIntArray.java b/j2k/tests/testData/fileOrElement/arrayType/newIntArray.java similarity index 100% rename from j2k/tests/testData/ast/arrayType/newIntArray.java rename to j2k/tests/testData/fileOrElement/arrayType/newIntArray.java diff --git a/j2k/tests/testData/ast/arrayType/newIntArray.kt b/j2k/tests/testData/fileOrElement/arrayType/newIntArray.kt similarity index 100% rename from j2k/tests/testData/ast/arrayType/newIntArray.kt rename to j2k/tests/testData/fileOrElement/arrayType/newIntArray.kt diff --git a/j2k/tests/testData/ast/arrayType/newStringArray.java b/j2k/tests/testData/fileOrElement/arrayType/newStringArray.java similarity index 100% rename from j2k/tests/testData/ast/arrayType/newStringArray.java rename to j2k/tests/testData/fileOrElement/arrayType/newStringArray.java diff --git a/j2k/tests/testData/ast/arrayType/newStringArray.kt b/j2k/tests/testData/fileOrElement/arrayType/newStringArray.kt similarity index 100% rename from j2k/tests/testData/ast/arrayType/newStringArray.kt rename to j2k/tests/testData/fileOrElement/arrayType/newStringArray.kt diff --git a/j2k/tests/testData/ast/assertStatement/onlyCondition.java b/j2k/tests/testData/fileOrElement/assertStatement/onlyCondition.java similarity index 100% rename from j2k/tests/testData/ast/assertStatement/onlyCondition.java rename to j2k/tests/testData/fileOrElement/assertStatement/onlyCondition.java diff --git a/j2k/tests/testData/ast/assertStatement/onlyCondition.kt b/j2k/tests/testData/fileOrElement/assertStatement/onlyCondition.kt similarity index 100% rename from j2k/tests/testData/ast/assertStatement/onlyCondition.kt rename to j2k/tests/testData/fileOrElement/assertStatement/onlyCondition.kt diff --git a/j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.java b/j2k/tests/testData/fileOrElement/assertStatement/onlyConditionWithBraces.java similarity index 100% rename from j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.java rename to j2k/tests/testData/fileOrElement/assertStatement/onlyConditionWithBraces.java diff --git a/j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.kt b/j2k/tests/testData/fileOrElement/assertStatement/onlyConditionWithBraces.kt similarity index 100% rename from j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.kt rename to j2k/tests/testData/fileOrElement/assertStatement/onlyConditionWithBraces.kt diff --git a/j2k/tests/testData/ast/assertStatement/withStringDetail.java b/j2k/tests/testData/fileOrElement/assertStatement/withStringDetail.java similarity index 100% rename from j2k/tests/testData/ast/assertStatement/withStringDetail.java rename to j2k/tests/testData/fileOrElement/assertStatement/withStringDetail.java diff --git a/j2k/tests/testData/ast/assertStatement/withStringDetail.kt b/j2k/tests/testData/fileOrElement/assertStatement/withStringDetail.kt similarity index 100% rename from j2k/tests/testData/ast/assertStatement/withStringDetail.kt rename to j2k/tests/testData/fileOrElement/assertStatement/withStringDetail.kt diff --git a/j2k/tests/testData/ast/assertStatement/withStringDetail2.java b/j2k/tests/testData/fileOrElement/assertStatement/withStringDetail2.java similarity index 100% rename from j2k/tests/testData/ast/assertStatement/withStringDetail2.java rename to j2k/tests/testData/fileOrElement/assertStatement/withStringDetail2.java diff --git a/j2k/tests/testData/ast/assertStatement/withStringDetail2.kt b/j2k/tests/testData/fileOrElement/assertStatement/withStringDetail2.kt similarity index 100% rename from j2k/tests/testData/ast/assertStatement/withStringDetail2.kt rename to j2k/tests/testData/fileOrElement/assertStatement/withStringDetail2.kt diff --git a/j2k/tests/testData/ast/assignmentExpression/and.java b/j2k/tests/testData/fileOrElement/assignmentExpression/and.java similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/and.java rename to j2k/tests/testData/fileOrElement/assignmentExpression/and.java diff --git a/j2k/tests/testData/ast/assignmentExpression/and.kt b/j2k/tests/testData/fileOrElement/assignmentExpression/and.kt similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/and.kt rename to j2k/tests/testData/fileOrElement/assignmentExpression/and.kt diff --git a/j2k/tests/testData/ast/assignmentExpression/assignment.java b/j2k/tests/testData/fileOrElement/assignmentExpression/assignment.java similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/assignment.java rename to j2k/tests/testData/fileOrElement/assignmentExpression/assignment.java diff --git a/j2k/tests/testData/ast/assignmentExpression/assignment.kt b/j2k/tests/testData/fileOrElement/assignmentExpression/assignment.kt similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/assignment.kt rename to j2k/tests/testData/fileOrElement/assignmentExpression/assignment.kt diff --git a/j2k/tests/testData/ast/assignmentExpression/divideAssign.java b/j2k/tests/testData/fileOrElement/assignmentExpression/divideAssign.java similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/divideAssign.java rename to j2k/tests/testData/fileOrElement/assignmentExpression/divideAssign.java diff --git a/j2k/tests/testData/ast/assignmentExpression/divideAssign.kt b/j2k/tests/testData/fileOrElement/assignmentExpression/divideAssign.kt similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/divideAssign.kt rename to j2k/tests/testData/fileOrElement/assignmentExpression/divideAssign.kt diff --git a/j2k/tests/testData/ast/assignmentExpression/minusAssign.java b/j2k/tests/testData/fileOrElement/assignmentExpression/minusAssign.java similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/minusAssign.java rename to j2k/tests/testData/fileOrElement/assignmentExpression/minusAssign.java diff --git a/j2k/tests/testData/ast/assignmentExpression/minusAssign.kt b/j2k/tests/testData/fileOrElement/assignmentExpression/minusAssign.kt similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/minusAssign.kt rename to j2k/tests/testData/fileOrElement/assignmentExpression/minusAssign.kt diff --git a/j2k/tests/testData/ast/assignmentExpression/multiplyAssign.java b/j2k/tests/testData/fileOrElement/assignmentExpression/multiplyAssign.java similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/multiplyAssign.java rename to j2k/tests/testData/fileOrElement/assignmentExpression/multiplyAssign.java diff --git a/j2k/tests/testData/ast/assignmentExpression/multiplyAssign.kt b/j2k/tests/testData/fileOrElement/assignmentExpression/multiplyAssign.kt similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/multiplyAssign.kt rename to j2k/tests/testData/fileOrElement/assignmentExpression/multiplyAssign.kt diff --git a/j2k/tests/testData/ast/assignmentExpression/nullability-settings.java b/j2k/tests/testData/fileOrElement/assignmentExpression/nullability-settings.java similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/nullability-settings.java rename to j2k/tests/testData/fileOrElement/assignmentExpression/nullability-settings.java diff --git a/j2k/tests/testData/ast/assignmentExpression/nullability-settings.kt b/j2k/tests/testData/fileOrElement/assignmentExpression/nullability-settings.kt similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/nullability-settings.kt rename to j2k/tests/testData/fileOrElement/assignmentExpression/nullability-settings.kt diff --git a/j2k/tests/testData/ast/assignmentExpression/nullability.java b/j2k/tests/testData/fileOrElement/assignmentExpression/nullability.java similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/nullability.java rename to j2k/tests/testData/fileOrElement/assignmentExpression/nullability.java diff --git a/j2k/tests/testData/ast/assignmentExpression/nullability.kt b/j2k/tests/testData/fileOrElement/assignmentExpression/nullability.kt similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/nullability.kt rename to j2k/tests/testData/fileOrElement/assignmentExpression/nullability.kt diff --git a/j2k/tests/testData/ast/assignmentExpression/or.java b/j2k/tests/testData/fileOrElement/assignmentExpression/or.java similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/or.java rename to j2k/tests/testData/fileOrElement/assignmentExpression/or.java diff --git a/j2k/tests/testData/ast/assignmentExpression/or.kt b/j2k/tests/testData/fileOrElement/assignmentExpression/or.kt similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/or.kt rename to j2k/tests/testData/fileOrElement/assignmentExpression/or.kt diff --git a/j2k/tests/testData/ast/assignmentExpression/plusAssign.java b/j2k/tests/testData/fileOrElement/assignmentExpression/plusAssign.java similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/plusAssign.java rename to j2k/tests/testData/fileOrElement/assignmentExpression/plusAssign.java diff --git a/j2k/tests/testData/ast/assignmentExpression/plusAssign.kt b/j2k/tests/testData/fileOrElement/assignmentExpression/plusAssign.kt similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/plusAssign.kt rename to j2k/tests/testData/fileOrElement/assignmentExpression/plusAssign.kt diff --git a/j2k/tests/testData/ast/assignmentExpression/reminder.java b/j2k/tests/testData/fileOrElement/assignmentExpression/reminder.java similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/reminder.java rename to j2k/tests/testData/fileOrElement/assignmentExpression/reminder.java diff --git a/j2k/tests/testData/ast/assignmentExpression/reminder.kt b/j2k/tests/testData/fileOrElement/assignmentExpression/reminder.kt similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/reminder.kt rename to j2k/tests/testData/fileOrElement/assignmentExpression/reminder.kt diff --git a/j2k/tests/testData/ast/assignmentExpression/shiftLeft.java b/j2k/tests/testData/fileOrElement/assignmentExpression/shiftLeft.java similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/shiftLeft.java rename to j2k/tests/testData/fileOrElement/assignmentExpression/shiftLeft.java diff --git a/j2k/tests/testData/ast/assignmentExpression/shiftLeft.kt b/j2k/tests/testData/fileOrElement/assignmentExpression/shiftLeft.kt similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/shiftLeft.kt rename to j2k/tests/testData/fileOrElement/assignmentExpression/shiftLeft.kt diff --git a/j2k/tests/testData/ast/assignmentExpression/shiftRight.java b/j2k/tests/testData/fileOrElement/assignmentExpression/shiftRight.java similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/shiftRight.java rename to j2k/tests/testData/fileOrElement/assignmentExpression/shiftRight.java diff --git a/j2k/tests/testData/ast/assignmentExpression/shiftRight.kt b/j2k/tests/testData/fileOrElement/assignmentExpression/shiftRight.kt similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/shiftRight.kt rename to j2k/tests/testData/fileOrElement/assignmentExpression/shiftRight.kt diff --git a/j2k/tests/testData/ast/assignmentExpression/simpleAssignment.java b/j2k/tests/testData/fileOrElement/assignmentExpression/simpleAssignment.java similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/simpleAssignment.java rename to j2k/tests/testData/fileOrElement/assignmentExpression/simpleAssignment.java diff --git a/j2k/tests/testData/ast/assignmentExpression/simpleAssignment.kt b/j2k/tests/testData/fileOrElement/assignmentExpression/simpleAssignment.kt similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/simpleAssignment.kt rename to j2k/tests/testData/fileOrElement/assignmentExpression/simpleAssignment.kt diff --git a/j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.java b/j2k/tests/testData/fileOrElement/assignmentExpression/unsignedRightShift.java similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.java rename to j2k/tests/testData/fileOrElement/assignmentExpression/unsignedRightShift.java diff --git a/j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.kt b/j2k/tests/testData/fileOrElement/assignmentExpression/unsignedRightShift.kt similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.kt rename to j2k/tests/testData/fileOrElement/assignmentExpression/unsignedRightShift.kt diff --git a/j2k/tests/testData/ast/assignmentExpression/xor.java b/j2k/tests/testData/fileOrElement/assignmentExpression/xor.java similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/xor.java rename to j2k/tests/testData/fileOrElement/assignmentExpression/xor.java diff --git a/j2k/tests/testData/ast/assignmentExpression/xor.kt b/j2k/tests/testData/fileOrElement/assignmentExpression/xor.kt similarity index 100% rename from j2k/tests/testData/ast/assignmentExpression/xor.kt rename to j2k/tests/testData/fileOrElement/assignmentExpression/xor.kt diff --git a/j2k/tests/testData/ast/binaryExpression/and.java b/j2k/tests/testData/fileOrElement/binaryExpression/and.java similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/and.java rename to j2k/tests/testData/fileOrElement/binaryExpression/and.java diff --git a/j2k/tests/testData/ast/binaryExpression/and.kt b/j2k/tests/testData/fileOrElement/binaryExpression/and.kt similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/and.kt rename to j2k/tests/testData/fileOrElement/binaryExpression/and.kt diff --git a/j2k/tests/testData/ast/binaryExpression/conditionalAnd.java b/j2k/tests/testData/fileOrElement/binaryExpression/conditionalAnd.java similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/conditionalAnd.java rename to j2k/tests/testData/fileOrElement/binaryExpression/conditionalAnd.java diff --git a/j2k/tests/testData/ast/binaryExpression/conditionalAnd.kt b/j2k/tests/testData/fileOrElement/binaryExpression/conditionalAnd.kt similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/conditionalAnd.kt rename to j2k/tests/testData/fileOrElement/binaryExpression/conditionalAnd.kt diff --git a/j2k/tests/testData/ast/binaryExpression/conditionalOr.java b/j2k/tests/testData/fileOrElement/binaryExpression/conditionalOr.java similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/conditionalOr.java rename to j2k/tests/testData/fileOrElement/binaryExpression/conditionalOr.java diff --git a/j2k/tests/testData/ast/binaryExpression/conditionalOr.kt b/j2k/tests/testData/fileOrElement/binaryExpression/conditionalOr.kt similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/conditionalOr.kt rename to j2k/tests/testData/fileOrElement/binaryExpression/conditionalOr.kt diff --git a/j2k/tests/testData/ast/binaryExpression/divide.java b/j2k/tests/testData/fileOrElement/binaryExpression/divide.java similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/divide.java rename to j2k/tests/testData/fileOrElement/binaryExpression/divide.java diff --git a/j2k/tests/testData/ast/binaryExpression/divide.kt b/j2k/tests/testData/fileOrElement/binaryExpression/divide.kt similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/divide.kt rename to j2k/tests/testData/fileOrElement/binaryExpression/divide.kt diff --git a/j2k/tests/testData/ast/binaryExpression/greaterThan.java b/j2k/tests/testData/fileOrElement/binaryExpression/greaterThan.java similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/greaterThan.java rename to j2k/tests/testData/fileOrElement/binaryExpression/greaterThan.java diff --git a/j2k/tests/testData/ast/binaryExpression/greaterThan.kt b/j2k/tests/testData/fileOrElement/binaryExpression/greaterThan.kt similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/greaterThan.kt rename to j2k/tests/testData/fileOrElement/binaryExpression/greaterThan.kt diff --git a/j2k/tests/testData/ast/binaryExpression/greaterThanEqual.java b/j2k/tests/testData/fileOrElement/binaryExpression/greaterThanEqual.java similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/greaterThanEqual.java rename to j2k/tests/testData/fileOrElement/binaryExpression/greaterThanEqual.java diff --git a/j2k/tests/testData/ast/binaryExpression/greaterThanEqual.kt b/j2k/tests/testData/fileOrElement/binaryExpression/greaterThanEqual.kt similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/greaterThanEqual.kt rename to j2k/tests/testData/fileOrElement/binaryExpression/greaterThanEqual.kt diff --git a/j2k/tests/testData/ast/binaryExpression/lessThan.java b/j2k/tests/testData/fileOrElement/binaryExpression/lessThan.java similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/lessThan.java rename to j2k/tests/testData/fileOrElement/binaryExpression/lessThan.java diff --git a/j2k/tests/testData/ast/binaryExpression/lessThan.kt b/j2k/tests/testData/fileOrElement/binaryExpression/lessThan.kt similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/lessThan.kt rename to j2k/tests/testData/fileOrElement/binaryExpression/lessThan.kt diff --git a/j2k/tests/testData/ast/binaryExpression/lessThanEqual.java b/j2k/tests/testData/fileOrElement/binaryExpression/lessThanEqual.java similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/lessThanEqual.java rename to j2k/tests/testData/fileOrElement/binaryExpression/lessThanEqual.java diff --git a/j2k/tests/testData/ast/binaryExpression/lessThanEqual.kt b/j2k/tests/testData/fileOrElement/binaryExpression/lessThanEqual.kt similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/lessThanEqual.kt rename to j2k/tests/testData/fileOrElement/binaryExpression/lessThanEqual.kt diff --git a/j2k/tests/testData/ast/binaryExpression/minus.java b/j2k/tests/testData/fileOrElement/binaryExpression/minus.java similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/minus.java rename to j2k/tests/testData/fileOrElement/binaryExpression/minus.java diff --git a/j2k/tests/testData/ast/binaryExpression/minus.kt b/j2k/tests/testData/fileOrElement/binaryExpression/minus.kt similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/minus.kt rename to j2k/tests/testData/fileOrElement/binaryExpression/minus.kt diff --git a/j2k/tests/testData/ast/binaryExpression/multiplePlusMinus.java b/j2k/tests/testData/fileOrElement/binaryExpression/multiplePlusMinus.java similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/multiplePlusMinus.java rename to j2k/tests/testData/fileOrElement/binaryExpression/multiplePlusMinus.java diff --git a/j2k/tests/testData/ast/binaryExpression/multiplePlusMinus.kt b/j2k/tests/testData/fileOrElement/binaryExpression/multiplePlusMinus.kt similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/multiplePlusMinus.kt rename to j2k/tests/testData/fileOrElement/binaryExpression/multiplePlusMinus.kt diff --git a/j2k/tests/testData/ast/binaryExpression/multiply.java b/j2k/tests/testData/fileOrElement/binaryExpression/multiply.java similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/multiply.java rename to j2k/tests/testData/fileOrElement/binaryExpression/multiply.java diff --git a/j2k/tests/testData/ast/binaryExpression/multiply.kt b/j2k/tests/testData/fileOrElement/binaryExpression/multiply.kt similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/multiply.kt rename to j2k/tests/testData/fileOrElement/binaryExpression/multiply.kt diff --git a/j2k/tests/testData/ast/binaryExpression/or.java b/j2k/tests/testData/fileOrElement/binaryExpression/or.java similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/or.java rename to j2k/tests/testData/fileOrElement/binaryExpression/or.java diff --git a/j2k/tests/testData/ast/binaryExpression/or.kt b/j2k/tests/testData/fileOrElement/binaryExpression/or.kt similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/or.kt rename to j2k/tests/testData/fileOrElement/binaryExpression/or.kt diff --git a/j2k/tests/testData/ast/binaryExpression/plus.java b/j2k/tests/testData/fileOrElement/binaryExpression/plus.java similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/plus.java rename to j2k/tests/testData/fileOrElement/binaryExpression/plus.java diff --git a/j2k/tests/testData/ast/binaryExpression/plus.kt b/j2k/tests/testData/fileOrElement/binaryExpression/plus.kt similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/plus.kt rename to j2k/tests/testData/fileOrElement/binaryExpression/plus.kt diff --git a/j2k/tests/testData/ast/binaryExpression/remainder.java b/j2k/tests/testData/fileOrElement/binaryExpression/remainder.java similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/remainder.java rename to j2k/tests/testData/fileOrElement/binaryExpression/remainder.java diff --git a/j2k/tests/testData/ast/binaryExpression/remainder.kt b/j2k/tests/testData/fileOrElement/binaryExpression/remainder.kt similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/remainder.kt rename to j2k/tests/testData/fileOrElement/binaryExpression/remainder.kt diff --git a/j2k/tests/testData/ast/binaryExpression/shiftLeft.java b/j2k/tests/testData/fileOrElement/binaryExpression/shiftLeft.java similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/shiftLeft.java rename to j2k/tests/testData/fileOrElement/binaryExpression/shiftLeft.java diff --git a/j2k/tests/testData/ast/binaryExpression/shiftLeft.kt b/j2k/tests/testData/fileOrElement/binaryExpression/shiftLeft.kt similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/shiftLeft.kt rename to j2k/tests/testData/fileOrElement/binaryExpression/shiftLeft.kt diff --git a/j2k/tests/testData/ast/binaryExpression/shiftRight.java b/j2k/tests/testData/fileOrElement/binaryExpression/shiftRight.java similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/shiftRight.java rename to j2k/tests/testData/fileOrElement/binaryExpression/shiftRight.java diff --git a/j2k/tests/testData/ast/binaryExpression/shiftRight.kt b/j2k/tests/testData/fileOrElement/binaryExpression/shiftRight.kt similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/shiftRight.kt rename to j2k/tests/testData/fileOrElement/binaryExpression/shiftRight.kt diff --git a/j2k/tests/testData/ast/binaryExpression/unsignedRightShift.java b/j2k/tests/testData/fileOrElement/binaryExpression/unsignedRightShift.java similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/unsignedRightShift.java rename to j2k/tests/testData/fileOrElement/binaryExpression/unsignedRightShift.java diff --git a/j2k/tests/testData/ast/binaryExpression/unsignedRightShift.kt b/j2k/tests/testData/fileOrElement/binaryExpression/unsignedRightShift.kt similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/unsignedRightShift.kt rename to j2k/tests/testData/fileOrElement/binaryExpression/unsignedRightShift.kt diff --git a/j2k/tests/testData/ast/binaryExpression/xor.java b/j2k/tests/testData/fileOrElement/binaryExpression/xor.java similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/xor.java rename to j2k/tests/testData/fileOrElement/binaryExpression/xor.java diff --git a/j2k/tests/testData/ast/binaryExpression/xor.kt b/j2k/tests/testData/fileOrElement/binaryExpression/xor.kt similarity index 100% rename from j2k/tests/testData/ast/binaryExpression/xor.kt rename to j2k/tests/testData/fileOrElement/binaryExpression/xor.kt diff --git a/j2k/tests/testData/ast/blocks/Blocks.java b/j2k/tests/testData/fileOrElement/blocks/Blocks.java similarity index 100% rename from j2k/tests/testData/ast/blocks/Blocks.java rename to j2k/tests/testData/fileOrElement/blocks/Blocks.java diff --git a/j2k/tests/testData/ast/blocks/Blocks.kt b/j2k/tests/testData/fileOrElement/blocks/Blocks.kt similarity index 100% rename from j2k/tests/testData/ast/blocks/Blocks.kt rename to j2k/tests/testData/fileOrElement/blocks/Blocks.kt diff --git a/j2k/tests/testData/ast/boxedType/Boxing.java b/j2k/tests/testData/fileOrElement/boxedType/Boxing.java similarity index 100% rename from j2k/tests/testData/ast/boxedType/Boxing.java rename to j2k/tests/testData/fileOrElement/boxedType/Boxing.java diff --git a/j2k/tests/testData/ast/boxedType/Boxing.kt b/j2k/tests/testData/fileOrElement/boxedType/Boxing.kt similarity index 100% rename from j2k/tests/testData/ast/boxedType/Boxing.kt rename to j2k/tests/testData/fileOrElement/boxedType/Boxing.kt diff --git a/j2k/tests/testData/ast/boxedType/boolean.java b/j2k/tests/testData/fileOrElement/boxedType/boolean.java similarity index 100% rename from j2k/tests/testData/ast/boxedType/boolean.java rename to j2k/tests/testData/fileOrElement/boxedType/boolean.java diff --git a/j2k/tests/testData/ast/boxedType/boolean.kt b/j2k/tests/testData/fileOrElement/boxedType/boolean.kt similarity index 100% rename from j2k/tests/testData/ast/boxedType/boolean.kt rename to j2k/tests/testData/fileOrElement/boxedType/boolean.kt diff --git a/j2k/tests/testData/ast/boxedType/byte.java b/j2k/tests/testData/fileOrElement/boxedType/byte.java similarity index 100% rename from j2k/tests/testData/ast/boxedType/byte.java rename to j2k/tests/testData/fileOrElement/boxedType/byte.java diff --git a/j2k/tests/testData/ast/boxedType/byte.kt b/j2k/tests/testData/fileOrElement/boxedType/byte.kt similarity index 100% rename from j2k/tests/testData/ast/boxedType/byte.kt rename to j2k/tests/testData/fileOrElement/boxedType/byte.kt diff --git a/j2k/tests/testData/ast/boxedType/character.java b/j2k/tests/testData/fileOrElement/boxedType/character.java similarity index 100% rename from j2k/tests/testData/ast/boxedType/character.java rename to j2k/tests/testData/fileOrElement/boxedType/character.java diff --git a/j2k/tests/testData/ast/boxedType/character.kt b/j2k/tests/testData/fileOrElement/boxedType/character.kt similarity index 100% rename from j2k/tests/testData/ast/boxedType/character.kt rename to j2k/tests/testData/fileOrElement/boxedType/character.kt diff --git a/j2k/tests/testData/ast/boxedType/double.java b/j2k/tests/testData/fileOrElement/boxedType/double.java similarity index 100% rename from j2k/tests/testData/ast/boxedType/double.java rename to j2k/tests/testData/fileOrElement/boxedType/double.java diff --git a/j2k/tests/testData/ast/boxedType/double.kt b/j2k/tests/testData/fileOrElement/boxedType/double.kt similarity index 100% rename from j2k/tests/testData/ast/boxedType/double.kt rename to j2k/tests/testData/fileOrElement/boxedType/double.kt diff --git a/j2k/tests/testData/ast/boxedType/float.java b/j2k/tests/testData/fileOrElement/boxedType/float.java similarity index 100% rename from j2k/tests/testData/ast/boxedType/float.java rename to j2k/tests/testData/fileOrElement/boxedType/float.java diff --git a/j2k/tests/testData/ast/boxedType/float.kt b/j2k/tests/testData/fileOrElement/boxedType/float.kt similarity index 100% rename from j2k/tests/testData/ast/boxedType/float.kt rename to j2k/tests/testData/fileOrElement/boxedType/float.kt diff --git a/j2k/tests/testData/ast/boxedType/integer.java b/j2k/tests/testData/fileOrElement/boxedType/integer.java similarity index 100% rename from j2k/tests/testData/ast/boxedType/integer.java rename to j2k/tests/testData/fileOrElement/boxedType/integer.java diff --git a/j2k/tests/testData/ast/boxedType/integer.kt b/j2k/tests/testData/fileOrElement/boxedType/integer.kt similarity index 100% rename from j2k/tests/testData/ast/boxedType/integer.kt rename to j2k/tests/testData/fileOrElement/boxedType/integer.kt diff --git a/j2k/tests/testData/ast/boxedType/kt-671.java b/j2k/tests/testData/fileOrElement/boxedType/kt-671.java similarity index 100% rename from j2k/tests/testData/ast/boxedType/kt-671.java rename to j2k/tests/testData/fileOrElement/boxedType/kt-671.java diff --git a/j2k/tests/testData/ast/boxedType/kt-671.kt b/j2k/tests/testData/fileOrElement/boxedType/kt-671.kt similarity index 100% rename from j2k/tests/testData/ast/boxedType/kt-671.kt rename to j2k/tests/testData/fileOrElement/boxedType/kt-671.kt diff --git a/j2k/tests/testData/ast/boxedType/long.java b/j2k/tests/testData/fileOrElement/boxedType/long.java similarity index 100% rename from j2k/tests/testData/ast/boxedType/long.java rename to j2k/tests/testData/fileOrElement/boxedType/long.java diff --git a/j2k/tests/testData/ast/boxedType/long.kt b/j2k/tests/testData/fileOrElement/boxedType/long.kt similarity index 100% rename from j2k/tests/testData/ast/boxedType/long.kt rename to j2k/tests/testData/fileOrElement/boxedType/long.kt diff --git a/j2k/tests/testData/ast/boxedType/object.java b/j2k/tests/testData/fileOrElement/boxedType/object.java similarity index 100% rename from j2k/tests/testData/ast/boxedType/object.java rename to j2k/tests/testData/fileOrElement/boxedType/object.java diff --git a/j2k/tests/testData/ast/boxedType/object.kt b/j2k/tests/testData/fileOrElement/boxedType/object.kt similarity index 100% rename from j2k/tests/testData/ast/boxedType/object.kt rename to j2k/tests/testData/fileOrElement/boxedType/object.kt diff --git a/j2k/tests/testData/ast/boxedType/short.java b/j2k/tests/testData/fileOrElement/boxedType/short.java similarity index 100% rename from j2k/tests/testData/ast/boxedType/short.java rename to j2k/tests/testData/fileOrElement/boxedType/short.java diff --git a/j2k/tests/testData/ast/boxedType/short.kt b/j2k/tests/testData/fileOrElement/boxedType/short.kt similarity index 100% rename from j2k/tests/testData/ast/boxedType/short.kt rename to j2k/tests/testData/fileOrElement/boxedType/short.kt diff --git a/j2k/tests/testData/ast/breakStatement/breakWithLabel.java b/j2k/tests/testData/fileOrElement/breakStatement/breakWithLabel.java similarity index 100% rename from j2k/tests/testData/ast/breakStatement/breakWithLabel.java rename to j2k/tests/testData/fileOrElement/breakStatement/breakWithLabel.java diff --git a/j2k/tests/testData/ast/breakStatement/breakWithLabel.kt b/j2k/tests/testData/fileOrElement/breakStatement/breakWithLabel.kt similarity index 100% rename from j2k/tests/testData/ast/breakStatement/breakWithLabel.kt rename to j2k/tests/testData/fileOrElement/breakStatement/breakWithLabel.kt diff --git a/j2k/tests/testData/ast/breakStatement/breakWithoutLabel.java b/j2k/tests/testData/fileOrElement/breakStatement/breakWithoutLabel.java similarity index 100% rename from j2k/tests/testData/ast/breakStatement/breakWithoutLabel.java rename to j2k/tests/testData/fileOrElement/breakStatement/breakWithoutLabel.java diff --git a/j2k/tests/testData/ast/breakStatement/breakWithoutLabel.kt b/j2k/tests/testData/fileOrElement/breakStatement/breakWithoutLabel.kt similarity index 100% rename from j2k/tests/testData/ast/breakStatement/breakWithoutLabel.kt rename to j2k/tests/testData/fileOrElement/breakStatement/breakWithoutLabel.kt diff --git a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.java b/j2k/tests/testData/fileOrElement/callChainExpression/libraryFieldCall.java similarity index 100% rename from j2k/tests/testData/ast/callChainExpression/libraryFieldCall.java rename to j2k/tests/testData/fileOrElement/callChainExpression/libraryFieldCall.java diff --git a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt b/j2k/tests/testData/fileOrElement/callChainExpression/libraryFieldCall.kt similarity index 100% rename from j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt rename to j2k/tests/testData/fileOrElement/callChainExpression/libraryFieldCall.kt diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.java b/j2k/tests/testData/fileOrElement/callChainExpression/libraryMethodCall.java similarity index 100% rename from j2k/tests/testData/ast/callChainExpression/libraryMethodCall.java rename to j2k/tests/testData/fileOrElement/callChainExpression/libraryMethodCall.java diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt b/j2k/tests/testData/fileOrElement/callChainExpression/libraryMethodCall.kt similarity index 100% rename from j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt rename to j2k/tests/testData/fileOrElement/callChainExpression/libraryMethodCall.kt diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.java b/j2k/tests/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.java similarity index 100% rename from j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.java rename to j2k/tests/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.java diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.kt b/j2k/tests/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.kt similarity index 100% rename from j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.kt rename to j2k/tests/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.kt diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.java b/j2k/tests/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance.java similarity index 100% rename from j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.java rename to j2k/tests/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance.java diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt b/j2k/tests/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance.kt similarity index 100% rename from j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt rename to j2k/tests/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance.kt diff --git a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.java b/j2k/tests/testData/fileOrElement/callChainExpression/libraryStringFieldCall.java similarity index 100% rename from j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.java rename to j2k/tests/testData/fileOrElement/callChainExpression/libraryStringFieldCall.java diff --git a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt b/j2k/tests/testData/fileOrElement/callChainExpression/libraryStringFieldCall.kt similarity index 100% rename from j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt rename to j2k/tests/testData/fileOrElement/callChainExpression/libraryStringFieldCall.kt diff --git a/j2k/tests/testData/ast/callChainExpression/sout.java b/j2k/tests/testData/fileOrElement/callChainExpression/sout.java similarity index 100% rename from j2k/tests/testData/ast/callChainExpression/sout.java rename to j2k/tests/testData/fileOrElement/callChainExpression/sout.java diff --git a/j2k/tests/testData/ast/callChainExpression/sout.kt b/j2k/tests/testData/fileOrElement/callChainExpression/sout.kt similarity index 100% rename from j2k/tests/testData/ast/callChainExpression/sout.kt rename to j2k/tests/testData/fileOrElement/callChainExpression/sout.kt diff --git a/j2k/tests/testData/ast/class/ClassShadowing.java b/j2k/tests/testData/fileOrElement/class/ClassShadowing.java similarity index 100% rename from j2k/tests/testData/ast/class/ClassShadowing.java rename to j2k/tests/testData/fileOrElement/class/ClassShadowing.java diff --git a/j2k/tests/testData/ast/class/ClassShadowing.kt b/j2k/tests/testData/fileOrElement/class/ClassShadowing.kt similarity index 100% rename from j2k/tests/testData/ast/class/ClassShadowing.kt rename to j2k/tests/testData/fileOrElement/class/ClassShadowing.kt diff --git a/j2k/tests/testData/ast/class/abstractClass.java b/j2k/tests/testData/fileOrElement/class/abstractClass.java similarity index 100% rename from j2k/tests/testData/ast/class/abstractClass.java rename to j2k/tests/testData/fileOrElement/class/abstractClass.java diff --git a/j2k/tests/testData/ast/class/abstractClass.kt b/j2k/tests/testData/fileOrElement/class/abstractClass.kt similarity index 100% rename from j2k/tests/testData/ast/class/abstractClass.kt rename to j2k/tests/testData/fileOrElement/class/abstractClass.kt diff --git a/j2k/tests/testData/ast/class/abstractClassShape.java b/j2k/tests/testData/fileOrElement/class/abstractClassShape.java similarity index 100% rename from j2k/tests/testData/ast/class/abstractClassShape.java rename to j2k/tests/testData/fileOrElement/class/abstractClassShape.java diff --git a/j2k/tests/testData/ast/class/abstractClassShape.kt b/j2k/tests/testData/fileOrElement/class/abstractClassShape.kt similarity index 100% rename from j2k/tests/testData/ast/class/abstractClassShape.kt rename to j2k/tests/testData/fileOrElement/class/abstractClassShape.kt diff --git a/j2k/tests/testData/ast/class/class.java b/j2k/tests/testData/fileOrElement/class/class.java similarity index 100% rename from j2k/tests/testData/ast/class/class.java rename to j2k/tests/testData/fileOrElement/class/class.java diff --git a/j2k/tests/testData/ast/class/class.kt b/j2k/tests/testData/fileOrElement/class/class.kt similarity index 100% rename from j2k/tests/testData/ast/class/class.kt rename to j2k/tests/testData/fileOrElement/class/class.kt diff --git a/j2k/tests/testData/ast/class/classWithEmptyMethods.java b/j2k/tests/testData/fileOrElement/class/classWithEmptyMethods.java similarity index 100% rename from j2k/tests/testData/ast/class/classWithEmptyMethods.java rename to j2k/tests/testData/fileOrElement/class/classWithEmptyMethods.java diff --git a/j2k/tests/testData/ast/class/classWithEmptyMethods.kt b/j2k/tests/testData/fileOrElement/class/classWithEmptyMethods.kt similarity index 100% rename from j2k/tests/testData/ast/class/classWithEmptyMethods.kt rename to j2k/tests/testData/fileOrElement/class/classWithEmptyMethods.kt diff --git a/j2k/tests/testData/ast/class/classWithFields.java b/j2k/tests/testData/fileOrElement/class/classWithFields.java similarity index 100% rename from j2k/tests/testData/ast/class/classWithFields.java rename to j2k/tests/testData/fileOrElement/class/classWithFields.java diff --git a/j2k/tests/testData/ast/class/classWithFields.kt b/j2k/tests/testData/fileOrElement/class/classWithFields.kt similarity index 100% rename from j2k/tests/testData/ast/class/classWithFields.kt rename to j2k/tests/testData/fileOrElement/class/classWithFields.kt diff --git a/j2k/tests/testData/ast/class/classWithMultiplyFields.java b/j2k/tests/testData/fileOrElement/class/classWithMultiplyFields.java similarity index 100% rename from j2k/tests/testData/ast/class/classWithMultiplyFields.java rename to j2k/tests/testData/fileOrElement/class/classWithMultiplyFields.java diff --git a/j2k/tests/testData/ast/class/classWithMultiplyFields.kt b/j2k/tests/testData/fileOrElement/class/classWithMultiplyFields.kt similarity index 100% rename from j2k/tests/testData/ast/class/classWithMultiplyFields.kt rename to j2k/tests/testData/fileOrElement/class/classWithMultiplyFields.kt diff --git a/j2k/tests/testData/ast/class/emptyClass.java b/j2k/tests/testData/fileOrElement/class/emptyClass.java similarity index 100% rename from j2k/tests/testData/ast/class/emptyClass.java rename to j2k/tests/testData/fileOrElement/class/emptyClass.java diff --git a/j2k/tests/testData/ast/class/emptyClass.kt b/j2k/tests/testData/fileOrElement/class/emptyClass.kt similarity index 100% rename from j2k/tests/testData/ast/class/emptyClass.kt rename to j2k/tests/testData/fileOrElement/class/emptyClass.kt diff --git a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.java b/j2k/tests/testData/fileOrElement/class/extendsOneClassAndImplementsOneInterface.java similarity index 100% rename from j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.java rename to j2k/tests/testData/fileOrElement/class/extendsOneClassAndImplementsOneInterface.java diff --git a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.kt b/j2k/tests/testData/fileOrElement/class/extendsOneClassAndImplementsOneInterface.kt similarity index 100% rename from j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.kt rename to j2k/tests/testData/fileOrElement/class/extendsOneClassAndImplementsOneInterface.kt diff --git a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.java b/j2k/tests/testData/fileOrElement/class/extendsOneClassAndImplementsSeveralInterfaces.java similarity index 100% rename from j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.java rename to j2k/tests/testData/fileOrElement/class/extendsOneClassAndImplementsSeveralInterfaces.java diff --git a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.kt b/j2k/tests/testData/fileOrElement/class/extendsOneClassAndImplementsSeveralInterfaces.kt similarity index 100% rename from j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.kt rename to j2k/tests/testData/fileOrElement/class/extendsOneClassAndImplementsSeveralInterfaces.kt diff --git a/j2k/tests/testData/ast/class/finalClass.java b/j2k/tests/testData/fileOrElement/class/finalClass.java similarity index 100% rename from j2k/tests/testData/ast/class/finalClass.java rename to j2k/tests/testData/fileOrElement/class/finalClass.java diff --git a/j2k/tests/testData/ast/class/finalClass.kt b/j2k/tests/testData/fileOrElement/class/finalClass.kt similarity index 100% rename from j2k/tests/testData/ast/class/finalClass.kt rename to j2k/tests/testData/fileOrElement/class/finalClass.kt diff --git a/j2k/tests/testData/ast/class/genericClass.java b/j2k/tests/testData/fileOrElement/class/genericClass.java similarity index 100% rename from j2k/tests/testData/ast/class/genericClass.java rename to j2k/tests/testData/fileOrElement/class/genericClass.java diff --git a/j2k/tests/testData/ast/class/genericClass.kt b/j2k/tests/testData/fileOrElement/class/genericClass.kt similarity index 100% rename from j2k/tests/testData/ast/class/genericClass.kt rename to j2k/tests/testData/fileOrElement/class/genericClass.kt diff --git a/j2k/tests/testData/ast/class/innerClassInInterface.java b/j2k/tests/testData/fileOrElement/class/innerClassInInterface.java similarity index 100% rename from j2k/tests/testData/ast/class/innerClassInInterface.java rename to j2k/tests/testData/fileOrElement/class/innerClassInInterface.java diff --git a/j2k/tests/testData/ast/class/innerClassInInterface.kt b/j2k/tests/testData/fileOrElement/class/innerClassInInterface.kt similarity index 100% rename from j2k/tests/testData/ast/class/innerClassInInterface.kt rename to j2k/tests/testData/fileOrElement/class/innerClassInInterface.kt diff --git a/j2k/tests/testData/ast/class/innerEmptyClass.java b/j2k/tests/testData/fileOrElement/class/innerEmptyClass.java similarity index 100% rename from j2k/tests/testData/ast/class/innerEmptyClass.java rename to j2k/tests/testData/fileOrElement/class/innerEmptyClass.java diff --git a/j2k/tests/testData/ast/class/innerEmptyClass.kt b/j2k/tests/testData/fileOrElement/class/innerEmptyClass.kt similarity index 100% rename from j2k/tests/testData/ast/class/innerEmptyClass.kt rename to j2k/tests/testData/fileOrElement/class/innerEmptyClass.kt diff --git a/j2k/tests/testData/ast/class/innerEnum.java b/j2k/tests/testData/fileOrElement/class/innerEnum.java similarity index 100% rename from j2k/tests/testData/ast/class/innerEnum.java rename to j2k/tests/testData/fileOrElement/class/innerEnum.java diff --git a/j2k/tests/testData/ast/class/innerEnum.kt b/j2k/tests/testData/fileOrElement/class/innerEnum.kt similarity index 100% rename from j2k/tests/testData/ast/class/innerEnum.kt rename to j2k/tests/testData/fileOrElement/class/innerEnum.kt diff --git a/j2k/tests/testData/ast/class/innerInterface.java b/j2k/tests/testData/fileOrElement/class/innerInterface.java similarity index 100% rename from j2k/tests/testData/ast/class/innerInterface.java rename to j2k/tests/testData/fileOrElement/class/innerInterface.java diff --git a/j2k/tests/testData/ast/class/innerInterface.kt b/j2k/tests/testData/fileOrElement/class/innerInterface.kt similarity index 100% rename from j2k/tests/testData/ast/class/innerInterface.kt rename to j2k/tests/testData/fileOrElement/class/innerInterface.kt diff --git a/j2k/tests/testData/ast/class/innerStaticClass.java b/j2k/tests/testData/fileOrElement/class/innerStaticClass.java similarity index 100% rename from j2k/tests/testData/ast/class/innerStaticClass.java rename to j2k/tests/testData/fileOrElement/class/innerStaticClass.java diff --git a/j2k/tests/testData/ast/class/innerStaticClass.kt b/j2k/tests/testData/fileOrElement/class/innerStaticClass.kt similarity index 100% rename from j2k/tests/testData/ast/class/innerStaticClass.kt rename to j2k/tests/testData/fileOrElement/class/innerStaticClass.kt diff --git a/j2k/tests/testData/ast/class/internalClass.java b/j2k/tests/testData/fileOrElement/class/internalClass.java similarity index 100% rename from j2k/tests/testData/ast/class/internalClass.java rename to j2k/tests/testData/fileOrElement/class/internalClass.java diff --git a/j2k/tests/testData/ast/class/internalClass.kt b/j2k/tests/testData/fileOrElement/class/internalClass.kt similarity index 100% rename from j2k/tests/testData/ast/class/internalClass.kt rename to j2k/tests/testData/fileOrElement/class/internalClass.kt diff --git a/j2k/tests/testData/ast/class/kt-639.java b/j2k/tests/testData/fileOrElement/class/kt-639.java similarity index 100% rename from j2k/tests/testData/ast/class/kt-639.java rename to j2k/tests/testData/fileOrElement/class/kt-639.java diff --git a/j2k/tests/testData/ast/class/kt-639.kt b/j2k/tests/testData/fileOrElement/class/kt-639.kt similarity index 100% rename from j2k/tests/testData/ast/class/kt-639.kt rename to j2k/tests/testData/fileOrElement/class/kt-639.kt diff --git a/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.java b/j2k/tests/testData/fileOrElement/class/oneStaticFieldOneNonStatic.java similarity index 100% rename from j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.java rename to j2k/tests/testData/fileOrElement/class/oneStaticFieldOneNonStatic.java diff --git a/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.kt b/j2k/tests/testData/fileOrElement/class/oneStaticFieldOneNonStatic.kt similarity index 100% rename from j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.kt rename to j2k/tests/testData/fileOrElement/class/oneStaticFieldOneNonStatic.kt diff --git a/j2k/tests/testData/ast/class/oneStaticMethod.java b/j2k/tests/testData/fileOrElement/class/oneStaticMethod.java similarity index 100% rename from j2k/tests/testData/ast/class/oneStaticMethod.java rename to j2k/tests/testData/fileOrElement/class/oneStaticMethod.java diff --git a/j2k/tests/testData/ast/class/oneStaticMethod.kt b/j2k/tests/testData/fileOrElement/class/oneStaticMethod.kt similarity index 100% rename from j2k/tests/testData/ast/class/oneStaticMethod.kt rename to j2k/tests/testData/fileOrElement/class/oneStaticMethod.kt diff --git a/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.java b/j2k/tests/testData/fileOrElement/class/oneStaticMethodOneNonStatic.java similarity index 100% rename from j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.java rename to j2k/tests/testData/fileOrElement/class/oneStaticMethodOneNonStatic.java diff --git a/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.kt b/j2k/tests/testData/fileOrElement/class/oneStaticMethodOneNonStatic.kt similarity index 100% rename from j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.kt rename to j2k/tests/testData/fileOrElement/class/oneStaticMethodOneNonStatic.kt diff --git a/j2k/tests/testData/ast/class/pivateClass.java b/j2k/tests/testData/fileOrElement/class/pivateClass.java similarity index 100% rename from j2k/tests/testData/ast/class/pivateClass.java rename to j2k/tests/testData/fileOrElement/class/pivateClass.java diff --git a/j2k/tests/testData/ast/class/pivateClass.kt b/j2k/tests/testData/fileOrElement/class/pivateClass.kt similarity index 100% rename from j2k/tests/testData/ast/class/pivateClass.kt rename to j2k/tests/testData/fileOrElement/class/pivateClass.kt diff --git a/j2k/tests/testData/ast/class/privateInit.java b/j2k/tests/testData/fileOrElement/class/privateInit.java similarity index 100% rename from j2k/tests/testData/ast/class/privateInit.java rename to j2k/tests/testData/fileOrElement/class/privateInit.java diff --git a/j2k/tests/testData/ast/class/privateInit.kt b/j2k/tests/testData/fileOrElement/class/privateInit.kt similarity index 100% rename from j2k/tests/testData/ast/class/privateInit.kt rename to j2k/tests/testData/fileOrElement/class/privateInit.kt diff --git a/j2k/tests/testData/ast/class/protectedClass.java b/j2k/tests/testData/fileOrElement/class/protectedClass.java similarity index 100% rename from j2k/tests/testData/ast/class/protectedClass.java rename to j2k/tests/testData/fileOrElement/class/protectedClass.java diff --git a/j2k/tests/testData/ast/class/protectedClass.kt b/j2k/tests/testData/fileOrElement/class/protectedClass.kt similarity index 100% rename from j2k/tests/testData/ast/class/protectedClass.kt rename to j2k/tests/testData/fileOrElement/class/protectedClass.kt diff --git a/j2k/tests/testData/ast/class/publicClass.java b/j2k/tests/testData/fileOrElement/class/publicClass.java similarity index 100% rename from j2k/tests/testData/ast/class/publicClass.java rename to j2k/tests/testData/fileOrElement/class/publicClass.java diff --git a/j2k/tests/testData/ast/class/publicClass.kt b/j2k/tests/testData/fileOrElement/class/publicClass.kt similarity index 100% rename from j2k/tests/testData/ast/class/publicClass.kt rename to j2k/tests/testData/fileOrElement/class/publicClass.kt diff --git a/j2k/tests/testData/ast/class/simpleInheritance.java b/j2k/tests/testData/fileOrElement/class/simpleInheritance.java similarity index 100% rename from j2k/tests/testData/ast/class/simpleInheritance.java rename to j2k/tests/testData/fileOrElement/class/simpleInheritance.java diff --git a/j2k/tests/testData/ast/class/simpleInheritance.kt b/j2k/tests/testData/fileOrElement/class/simpleInheritance.kt similarity index 100% rename from j2k/tests/testData/ast/class/simpleInheritance.kt rename to j2k/tests/testData/fileOrElement/class/simpleInheritance.kt diff --git a/j2k/tests/testData/ast/class/twoStaticMethod.java b/j2k/tests/testData/fileOrElement/class/twoStaticMethod.java similarity index 100% rename from j2k/tests/testData/ast/class/twoStaticMethod.java rename to j2k/tests/testData/fileOrElement/class/twoStaticMethod.java diff --git a/j2k/tests/testData/ast/class/twoStaticMethod.kt b/j2k/tests/testData/fileOrElement/class/twoStaticMethod.kt similarity index 100% rename from j2k/tests/testData/ast/class/twoStaticMethod.kt rename to j2k/tests/testData/fileOrElement/class/twoStaticMethod.kt diff --git a/j2k/tests/testData/ast/classExpression/complexExample.java b/j2k/tests/testData/fileOrElement/classExpression/complexExample.java similarity index 100% rename from j2k/tests/testData/ast/classExpression/complexExample.java rename to j2k/tests/testData/fileOrElement/classExpression/complexExample.java diff --git a/j2k/tests/testData/ast/classExpression/complexExample.kt b/j2k/tests/testData/fileOrElement/classExpression/complexExample.kt similarity index 100% rename from j2k/tests/testData/ast/classExpression/complexExample.kt rename to j2k/tests/testData/fileOrElement/classExpression/complexExample.kt diff --git a/j2k/tests/testData/ast/classExpression/objectClass.java b/j2k/tests/testData/fileOrElement/classExpression/objectClass.java similarity index 100% rename from j2k/tests/testData/ast/classExpression/objectClass.java rename to j2k/tests/testData/fileOrElement/classExpression/objectClass.java diff --git a/j2k/tests/testData/ast/classExpression/objectClass.kt b/j2k/tests/testData/fileOrElement/classExpression/objectClass.kt similarity index 100% rename from j2k/tests/testData/ast/classExpression/objectClass.kt rename to j2k/tests/testData/fileOrElement/classExpression/objectClass.kt diff --git a/j2k/tests/testData/ast/classExpression/primitivesAndArrays.java b/j2k/tests/testData/fileOrElement/classExpression/primitivesAndArrays.java similarity index 100% rename from j2k/tests/testData/ast/classExpression/primitivesAndArrays.java rename to j2k/tests/testData/fileOrElement/classExpression/primitivesAndArrays.java diff --git a/j2k/tests/testData/ast/classExpression/primitivesAndArrays.kt b/j2k/tests/testData/fileOrElement/classExpression/primitivesAndArrays.kt similarity index 100% rename from j2k/tests/testData/ast/classExpression/primitivesAndArrays.kt rename to j2k/tests/testData/fileOrElement/classExpression/primitivesAndArrays.kt diff --git a/j2k/tests/testData/ast/classExpression/stringClass.java b/j2k/tests/testData/fileOrElement/classExpression/stringClass.java similarity index 100% rename from j2k/tests/testData/ast/classExpression/stringClass.java rename to j2k/tests/testData/fileOrElement/classExpression/stringClass.java diff --git a/j2k/tests/testData/ast/classExpression/stringClass.kt b/j2k/tests/testData/fileOrElement/classExpression/stringClass.kt similarity index 100% rename from j2k/tests/testData/ast/classExpression/stringClass.kt rename to j2k/tests/testData/fileOrElement/classExpression/stringClass.kt diff --git a/j2k/tests/testData/ast/comments/comments.java b/j2k/tests/testData/fileOrElement/comments/comments.java similarity index 100% rename from j2k/tests/testData/ast/comments/comments.java rename to j2k/tests/testData/fileOrElement/comments/comments.java diff --git a/j2k/tests/testData/ast/comments/comments.kt b/j2k/tests/testData/fileOrElement/comments/comments.kt similarity index 100% rename from j2k/tests/testData/ast/comments/comments.kt rename to j2k/tests/testData/fileOrElement/comments/comments.kt diff --git a/j2k/tests/testData/ast/comments/comments.kt.todo b/j2k/tests/testData/fileOrElement/comments/comments.kt.todo similarity index 100% rename from j2k/tests/testData/ast/comments/comments.kt.todo rename to j2k/tests/testData/fileOrElement/comments/comments.kt.todo diff --git a/j2k/tests/testData/ast/comments/comments2.java b/j2k/tests/testData/fileOrElement/comments/comments2.java similarity index 100% rename from j2k/tests/testData/ast/comments/comments2.java rename to j2k/tests/testData/fileOrElement/comments/comments2.java diff --git a/j2k/tests/testData/ast/comments/comments2.kt b/j2k/tests/testData/fileOrElement/comments/comments2.kt similarity index 100% rename from j2k/tests/testData/ast/comments/comments2.kt rename to j2k/tests/testData/fileOrElement/comments/comments2.kt diff --git a/j2k/tests/testData/ast/comments/commentsForConstructors.java b/j2k/tests/testData/fileOrElement/comments/commentsForConstructors.java similarity index 100% rename from j2k/tests/testData/ast/comments/commentsForConstructors.java rename to j2k/tests/testData/fileOrElement/comments/commentsForConstructors.java diff --git a/j2k/tests/testData/ast/comments/commentsForConstructors.kt b/j2k/tests/testData/fileOrElement/comments/commentsForConstructors.kt similarity index 100% rename from j2k/tests/testData/ast/comments/commentsForConstructors.kt rename to j2k/tests/testData/fileOrElement/comments/commentsForConstructors.kt diff --git a/j2k/tests/testData/ast/comments/fieldWithEndOfLineComment.java b/j2k/tests/testData/fileOrElement/comments/fieldWithEndOfLineComment.java similarity index 100% rename from j2k/tests/testData/ast/comments/fieldWithEndOfLineComment.java rename to j2k/tests/testData/fileOrElement/comments/fieldWithEndOfLineComment.java diff --git a/j2k/tests/testData/ast/comments/fieldWithEndOfLineComment.kt b/j2k/tests/testData/fileOrElement/comments/fieldWithEndOfLineComment.kt similarity index 100% rename from j2k/tests/testData/ast/comments/fieldWithEndOfLineComment.kt rename to j2k/tests/testData/fileOrElement/comments/fieldWithEndOfLineComment.kt diff --git a/j2k/tests/testData/ast/comments/fieldsInitializedFromParams.java b/j2k/tests/testData/fileOrElement/comments/fieldsInitializedFromParams.java similarity index 100% rename from j2k/tests/testData/ast/comments/fieldsInitializedFromParams.java rename to j2k/tests/testData/fileOrElement/comments/fieldsInitializedFromParams.java diff --git a/j2k/tests/testData/ast/comments/fieldsInitializedFromParams.kt b/j2k/tests/testData/fileOrElement/comments/fieldsInitializedFromParams.kt similarity index 100% rename from j2k/tests/testData/ast/comments/fieldsInitializedFromParams.kt rename to j2k/tests/testData/fileOrElement/comments/fieldsInitializedFromParams.kt diff --git a/j2k/tests/testData/ast/conditionalExpression/multiline.java b/j2k/tests/testData/fileOrElement/conditionalExpression/multiline.java similarity index 100% rename from j2k/tests/testData/ast/conditionalExpression/multiline.java rename to j2k/tests/testData/fileOrElement/conditionalExpression/multiline.java diff --git a/j2k/tests/testData/ast/conditionalExpression/multiline.kt b/j2k/tests/testData/fileOrElement/conditionalExpression/multiline.kt similarity index 100% rename from j2k/tests/testData/ast/conditionalExpression/multiline.kt rename to j2k/tests/testData/fileOrElement/conditionalExpression/multiline.kt diff --git a/j2k/tests/testData/ast/conditionalExpression/simple.java b/j2k/tests/testData/fileOrElement/conditionalExpression/simple.java similarity index 100% rename from j2k/tests/testData/ast/conditionalExpression/simple.java rename to j2k/tests/testData/fileOrElement/conditionalExpression/simple.java diff --git a/j2k/tests/testData/ast/conditionalExpression/simple.kt b/j2k/tests/testData/fileOrElement/conditionalExpression/simple.kt similarity index 100% rename from j2k/tests/testData/ast/conditionalExpression/simple.kt rename to j2k/tests/testData/fileOrElement/conditionalExpression/simple.kt diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary.java b/j2k/tests/testData/fileOrElement/constructors/allCallsPrimary.java similarity index 100% rename from j2k/tests/testData/ast/constructors/allCallsPrimary.java rename to j2k/tests/testData/fileOrElement/constructors/allCallsPrimary.java diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary.kt b/j2k/tests/testData/fileOrElement/constructors/allCallsPrimary.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/allCallsPrimary.kt rename to j2k/tests/testData/fileOrElement/constructors/allCallsPrimary.kt diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary2.java b/j2k/tests/testData/fileOrElement/constructors/allCallsPrimary2.java similarity index 100% rename from j2k/tests/testData/ast/constructors/allCallsPrimary2.java rename to j2k/tests/testData/fileOrElement/constructors/allCallsPrimary2.java diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt b/j2k/tests/testData/fileOrElement/constructors/allCallsPrimary2.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/allCallsPrimary2.kt rename to j2k/tests/testData/fileOrElement/constructors/allCallsPrimary2.kt diff --git a/j2k/tests/testData/ast/constructors/artificialPrimary.java b/j2k/tests/testData/fileOrElement/constructors/artificialPrimary.java similarity index 100% rename from j2k/tests/testData/ast/constructors/artificialPrimary.java rename to j2k/tests/testData/fileOrElement/constructors/artificialPrimary.java diff --git a/j2k/tests/testData/ast/constructors/artificialPrimary.kt b/j2k/tests/testData/fileOrElement/constructors/artificialPrimary.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/artificialPrimary.kt rename to j2k/tests/testData/fileOrElement/constructors/artificialPrimary.kt diff --git a/j2k/tests/testData/ast/constructors/chain.java b/j2k/tests/testData/fileOrElement/constructors/chain.java similarity index 100% rename from j2k/tests/testData/ast/constructors/chain.java rename to j2k/tests/testData/fileOrElement/constructors/chain.java diff --git a/j2k/tests/testData/ast/constructors/chain.kt b/j2k/tests/testData/fileOrElement/constructors/chain.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/chain.kt rename to j2k/tests/testData/fileOrElement/constructors/chain.kt diff --git a/j2k/tests/testData/ast/constructors/constructorAnnotations.java b/j2k/tests/testData/fileOrElement/constructors/constructorAnnotations.java similarity index 100% rename from j2k/tests/testData/ast/constructors/constructorAnnotations.java rename to j2k/tests/testData/fileOrElement/constructors/constructorAnnotations.java diff --git a/j2k/tests/testData/ast/constructors/constructorAnnotations.kt b/j2k/tests/testData/fileOrElement/constructors/constructorAnnotations.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/constructorAnnotations.kt rename to j2k/tests/testData/fileOrElement/constructors/constructorAnnotations.kt diff --git a/j2k/tests/testData/ast/constructors/customerBuilder.java b/j2k/tests/testData/fileOrElement/constructors/customerBuilder.java similarity index 100% rename from j2k/tests/testData/ast/constructors/customerBuilder.java rename to j2k/tests/testData/fileOrElement/constructors/customerBuilder.java diff --git a/j2k/tests/testData/ast/constructors/customerBuilder.kt b/j2k/tests/testData/fileOrElement/constructors/customerBuilder.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/customerBuilder.kt rename to j2k/tests/testData/fileOrElement/constructors/customerBuilder.kt diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.java b/j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams1.java similarity index 100% rename from j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.java rename to j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams1.java diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.kt b/j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams1.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.kt rename to j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams1.kt diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.java b/j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams2.java similarity index 100% rename from j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.java rename to j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams2.java diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.kt b/j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams2.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.kt rename to j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams2.kt diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.java b/j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams3.java similarity index 100% rename from j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.java rename to j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams3.java diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.kt b/j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams3.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.kt rename to j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams3.kt diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.java b/j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams4.java similarity index 100% rename from j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.java rename to j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams4.java diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.kt b/j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams4.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.kt rename to j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams4.kt diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.java b/j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams5.java similarity index 100% rename from j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.java rename to j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams5.java diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.kt b/j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams5.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.kt rename to j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams5.kt diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.java b/j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams6.java similarity index 100% rename from j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.java rename to j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams6.java diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.kt b/j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams6.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.kt rename to j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams6.kt diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.java b/j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams7.java similarity index 100% rename from j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.java rename to j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams7.java diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.kt b/j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams7.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.kt rename to j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams7.kt diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams8.java b/j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams8.java similarity index 100% rename from j2k/tests/testData/ast/constructors/fieldsInitializedFromParams8.java rename to j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams8.java diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams8.kt b/j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams8.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/fieldsInitializedFromParams8.kt rename to j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams8.kt diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams9.java b/j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams9.java similarity index 100% rename from j2k/tests/testData/ast/constructors/fieldsInitializedFromParams9.java rename to j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams9.java diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams9.kt b/j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams9.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/fieldsInitializedFromParams9.kt rename to j2k/tests/testData/fileOrElement/constructors/fieldsInitializedFromParams9.kt diff --git a/j2k/tests/testData/ast/constructors/genericIdentifier.java b/j2k/tests/testData/fileOrElement/constructors/genericIdentifier.java similarity index 100% rename from j2k/tests/testData/ast/constructors/genericIdentifier.java rename to j2k/tests/testData/fileOrElement/constructors/genericIdentifier.java diff --git a/j2k/tests/testData/ast/constructors/genericIdentifier.kt b/j2k/tests/testData/fileOrElement/constructors/genericIdentifier.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/genericIdentifier.kt rename to j2k/tests/testData/fileOrElement/constructors/genericIdentifier.kt diff --git a/j2k/tests/testData/ast/constructors/identifier.java b/j2k/tests/testData/fileOrElement/constructors/identifier.java similarity index 100% rename from j2k/tests/testData/ast/constructors/identifier.java rename to j2k/tests/testData/fileOrElement/constructors/identifier.java diff --git a/j2k/tests/testData/ast/constructors/identifier.kt b/j2k/tests/testData/fileOrElement/constructors/identifier.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/identifier.kt rename to j2k/tests/testData/fileOrElement/constructors/identifier.kt diff --git a/j2k/tests/testData/ast/constructors/methodCallInFactoryFun.java b/j2k/tests/testData/fileOrElement/constructors/methodCallInFactoryFun.java similarity index 100% rename from j2k/tests/testData/ast/constructors/methodCallInFactoryFun.java rename to j2k/tests/testData/fileOrElement/constructors/methodCallInFactoryFun.java diff --git a/j2k/tests/testData/ast/constructors/methodCallInFactoryFun.kt b/j2k/tests/testData/fileOrElement/constructors/methodCallInFactoryFun.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/methodCallInFactoryFun.kt rename to j2k/tests/testData/fileOrElement/constructors/methodCallInFactoryFun.kt diff --git a/j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults.java b/j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.java similarity index 100% rename from j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults.java rename to j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.java diff --git a/j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults.kt b/j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults.kt rename to j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt diff --git a/j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults2.java b/j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.java similarity index 100% rename from j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults2.java rename to j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.java diff --git a/j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults2.kt b/j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults2.kt rename to j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt diff --git a/j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults3.java b/j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.java similarity index 100% rename from j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults3.java rename to j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.java diff --git a/j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults3.kt b/j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults3.kt rename to j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt diff --git a/j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults4.java b/j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.java similarity index 100% rename from j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults4.java rename to j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.java diff --git a/j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults4.kt b/j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults4.kt rename to j2k/tests/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt diff --git a/j2k/tests/testData/ast/constructors/nestedClassNameInSuperParameters.java b/j2k/tests/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.java similarity index 100% rename from j2k/tests/testData/ast/constructors/nestedClassNameInSuperParameters.java rename to j2k/tests/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.java diff --git a/j2k/tests/testData/ast/constructors/nestedClassNameInSuperParameters.kt b/j2k/tests/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/nestedClassNameInSuperParameters.kt rename to j2k/tests/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.kt diff --git a/j2k/tests/testData/ast/constructors/noPrimary.java b/j2k/tests/testData/fileOrElement/constructors/noPrimary.java similarity index 100% rename from j2k/tests/testData/ast/constructors/noPrimary.java rename to j2k/tests/testData/fileOrElement/constructors/noPrimary.java diff --git a/j2k/tests/testData/ast/constructors/noPrimary.kt b/j2k/tests/testData/fileOrElement/constructors/noPrimary.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/noPrimary.kt rename to j2k/tests/testData/fileOrElement/constructors/noPrimary.kt diff --git a/j2k/tests/testData/ast/constructors/parameterDefaults1.java b/j2k/tests/testData/fileOrElement/constructors/parameterDefaults1.java similarity index 100% rename from j2k/tests/testData/ast/constructors/parameterDefaults1.java rename to j2k/tests/testData/fileOrElement/constructors/parameterDefaults1.java diff --git a/j2k/tests/testData/ast/constructors/parameterDefaults1.kt b/j2k/tests/testData/fileOrElement/constructors/parameterDefaults1.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/parameterDefaults1.kt rename to j2k/tests/testData/fileOrElement/constructors/parameterDefaults1.kt diff --git a/j2k/tests/testData/ast/constructors/parameterDefaults2.java b/j2k/tests/testData/fileOrElement/constructors/parameterDefaults2.java similarity index 100% rename from j2k/tests/testData/ast/constructors/parameterDefaults2.java rename to j2k/tests/testData/fileOrElement/constructors/parameterDefaults2.java diff --git a/j2k/tests/testData/ast/constructors/parameterDefaults2.kt b/j2k/tests/testData/fileOrElement/constructors/parameterDefaults2.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/parameterDefaults2.kt rename to j2k/tests/testData/fileOrElement/constructors/parameterDefaults2.kt diff --git a/j2k/tests/testData/ast/constructors/parameterDefaults3.java b/j2k/tests/testData/fileOrElement/constructors/parameterDefaults3.java similarity index 100% rename from j2k/tests/testData/ast/constructors/parameterDefaults3.java rename to j2k/tests/testData/fileOrElement/constructors/parameterDefaults3.java diff --git a/j2k/tests/testData/ast/constructors/parameterDefaults3.kt b/j2k/tests/testData/fileOrElement/constructors/parameterDefaults3.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/parameterDefaults3.kt rename to j2k/tests/testData/fileOrElement/constructors/parameterDefaults3.kt diff --git a/j2k/tests/testData/ast/constructors/parameterDefaults4.java b/j2k/tests/testData/fileOrElement/constructors/parameterDefaults4.java similarity index 100% rename from j2k/tests/testData/ast/constructors/parameterDefaults4.java rename to j2k/tests/testData/fileOrElement/constructors/parameterDefaults4.java diff --git a/j2k/tests/testData/ast/constructors/parameterDefaults4.kt b/j2k/tests/testData/fileOrElement/constructors/parameterDefaults4.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/parameterDefaults4.kt rename to j2k/tests/testData/fileOrElement/constructors/parameterDefaults4.kt diff --git a/j2k/tests/testData/ast/constructors/parameterDefaults5.java b/j2k/tests/testData/fileOrElement/constructors/parameterDefaults5.java similarity index 100% rename from j2k/tests/testData/ast/constructors/parameterDefaults5.java rename to j2k/tests/testData/fileOrElement/constructors/parameterDefaults5.java diff --git a/j2k/tests/testData/ast/constructors/parameterDefaults5.kt b/j2k/tests/testData/fileOrElement/constructors/parameterDefaults5.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/parameterDefaults5.kt rename to j2k/tests/testData/fileOrElement/constructors/parameterDefaults5.kt diff --git a/j2k/tests/testData/ast/constructors/parameterModification.java b/j2k/tests/testData/fileOrElement/constructors/parameterModification.java similarity index 100% rename from j2k/tests/testData/ast/constructors/parameterModification.java rename to j2k/tests/testData/fileOrElement/constructors/parameterModification.java diff --git a/j2k/tests/testData/ast/constructors/parameterModification.kt b/j2k/tests/testData/fileOrElement/constructors/parameterModification.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/parameterModification.kt rename to j2k/tests/testData/fileOrElement/constructors/parameterModification.kt diff --git a/j2k/tests/testData/ast/constructors/privateConstructors.java b/j2k/tests/testData/fileOrElement/constructors/privateConstructors.java similarity index 100% rename from j2k/tests/testData/ast/constructors/privateConstructors.java rename to j2k/tests/testData/fileOrElement/constructors/privateConstructors.java diff --git a/j2k/tests/testData/ast/constructors/privateConstructors.kt b/j2k/tests/testData/fileOrElement/constructors/privateConstructors.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/privateConstructors.kt rename to j2k/tests/testData/fileOrElement/constructors/privateConstructors.kt diff --git a/j2k/tests/testData/ast/constructors/qualifiedRefInFactoryFun.java b/j2k/tests/testData/fileOrElement/constructors/qualifiedRefInFactoryFun.java similarity index 100% rename from j2k/tests/testData/ast/constructors/qualifiedRefInFactoryFun.java rename to j2k/tests/testData/fileOrElement/constructors/qualifiedRefInFactoryFun.java diff --git a/j2k/tests/testData/ast/constructors/qualifiedRefInFactoryFun.kt b/j2k/tests/testData/fileOrElement/constructors/qualifiedRefInFactoryFun.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/qualifiedRefInFactoryFun.kt rename to j2k/tests/testData/fileOrElement/constructors/qualifiedRefInFactoryFun.kt diff --git a/j2k/tests/testData/ast/constructors/secondaryConstructorsInInnerClass.java b/j2k/tests/testData/fileOrElement/constructors/secondaryConstructorsInInnerClass.java similarity index 100% rename from j2k/tests/testData/ast/constructors/secondaryConstructorsInInnerClass.java rename to j2k/tests/testData/fileOrElement/constructors/secondaryConstructorsInInnerClass.java diff --git a/j2k/tests/testData/ast/constructors/secondaryConstructorsInInnerClass.kt b/j2k/tests/testData/fileOrElement/constructors/secondaryConstructorsInInnerClass.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/secondaryConstructorsInInnerClass.kt rename to j2k/tests/testData/fileOrElement/constructors/secondaryConstructorsInInnerClass.kt diff --git a/j2k/tests/testData/ast/constructors/secondaryConstructorsInNestedClass.java b/j2k/tests/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.java similarity index 100% rename from j2k/tests/testData/ast/constructors/secondaryConstructorsInNestedClass.java rename to j2k/tests/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.java diff --git a/j2k/tests/testData/ast/constructors/secondaryConstructorsInNestedClass.kt b/j2k/tests/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/secondaryConstructorsInNestedClass.kt rename to j2k/tests/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.kt diff --git a/j2k/tests/testData/ast/constructors/secondaryConstructorsVisibility.java b/j2k/tests/testData/fileOrElement/constructors/secondaryConstructorsVisibility.java similarity index 100% rename from j2k/tests/testData/ast/constructors/secondaryConstructorsVisibility.java rename to j2k/tests/testData/fileOrElement/constructors/secondaryConstructorsVisibility.java diff --git a/j2k/tests/testData/ast/constructors/secondaryConstructorsVisibility.kt b/j2k/tests/testData/fileOrElement/constructors/secondaryConstructorsVisibility.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/secondaryConstructorsVisibility.kt rename to j2k/tests/testData/fileOrElement/constructors/secondaryConstructorsVisibility.kt diff --git a/j2k/tests/testData/ast/constructors/staticFieldRefInFactoryFun.java b/j2k/tests/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.java similarity index 100% rename from j2k/tests/testData/ast/constructors/staticFieldRefInFactoryFun.java rename to j2k/tests/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.java diff --git a/j2k/tests/testData/ast/constructors/staticFieldRefInFactoryFun.kt b/j2k/tests/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/staticFieldRefInFactoryFun.kt rename to j2k/tests/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt diff --git a/j2k/tests/testData/ast/constructors/withManyDefaultParams.java b/j2k/tests/testData/fileOrElement/constructors/withManyDefaultParams.java similarity index 100% rename from j2k/tests/testData/ast/constructors/withManyDefaultParams.java rename to j2k/tests/testData/fileOrElement/constructors/withManyDefaultParams.java diff --git a/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt b/j2k/tests/testData/fileOrElement/constructors/withManyDefaultParams.kt similarity index 100% rename from j2k/tests/testData/ast/constructors/withManyDefaultParams.kt rename to j2k/tests/testData/fileOrElement/constructors/withManyDefaultParams.kt diff --git a/j2k/tests/testData/ast/continueStatement/continueWithLabel.java b/j2k/tests/testData/fileOrElement/continueStatement/continueWithLabel.java similarity index 100% rename from j2k/tests/testData/ast/continueStatement/continueWithLabel.java rename to j2k/tests/testData/fileOrElement/continueStatement/continueWithLabel.java diff --git a/j2k/tests/testData/ast/continueStatement/continueWithLabel.kt b/j2k/tests/testData/fileOrElement/continueStatement/continueWithLabel.kt similarity index 100% rename from j2k/tests/testData/ast/continueStatement/continueWithLabel.kt rename to j2k/tests/testData/fileOrElement/continueStatement/continueWithLabel.kt diff --git a/j2k/tests/testData/ast/continueStatement/continueWithoutLabel.java b/j2k/tests/testData/fileOrElement/continueStatement/continueWithoutLabel.java similarity index 100% rename from j2k/tests/testData/ast/continueStatement/continueWithoutLabel.java rename to j2k/tests/testData/fileOrElement/continueStatement/continueWithoutLabel.java diff --git a/j2k/tests/testData/ast/continueStatement/continueWithoutLabel.kt b/j2k/tests/testData/fileOrElement/continueStatement/continueWithoutLabel.kt similarity index 100% rename from j2k/tests/testData/ast/continueStatement/continueWithoutLabel.kt rename to j2k/tests/testData/fileOrElement/continueStatement/continueWithoutLabel.kt diff --git a/j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.java b/j2k/tests/testData/fileOrElement/declarationStatement/multiplyFinalIntDeclaration.java similarity index 100% rename from j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.java rename to j2k/tests/testData/fileOrElement/declarationStatement/multiplyFinalIntDeclaration.java diff --git a/j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.kt b/j2k/tests/testData/fileOrElement/declarationStatement/multiplyFinalIntDeclaration.kt similarity index 100% rename from j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.kt rename to j2k/tests/testData/fileOrElement/declarationStatement/multiplyFinalIntDeclaration.kt diff --git a/j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.java b/j2k/tests/testData/fileOrElement/declarationStatement/multiplyIntDeclaration.java similarity index 100% rename from j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.java rename to j2k/tests/testData/fileOrElement/declarationStatement/multiplyIntDeclaration.java diff --git a/j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.kt b/j2k/tests/testData/fileOrElement/declarationStatement/multiplyIntDeclaration.kt similarity index 100% rename from j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.kt rename to j2k/tests/testData/fileOrElement/declarationStatement/multiplyIntDeclaration.kt diff --git a/j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.java b/j2k/tests/testData/fileOrElement/declarationStatement/singleFinalIntDeclaration.java similarity index 100% rename from j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.java rename to j2k/tests/testData/fileOrElement/declarationStatement/singleFinalIntDeclaration.java diff --git a/j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.kt b/j2k/tests/testData/fileOrElement/declarationStatement/singleFinalIntDeclaration.kt similarity index 100% rename from j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.kt rename to j2k/tests/testData/fileOrElement/declarationStatement/singleFinalIntDeclaration.kt diff --git a/j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.java b/j2k/tests/testData/fileOrElement/declarationStatement/singleFinalStringDeclaration.java similarity index 100% rename from j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.java rename to j2k/tests/testData/fileOrElement/declarationStatement/singleFinalStringDeclaration.java diff --git a/j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.kt b/j2k/tests/testData/fileOrElement/declarationStatement/singleFinalStringDeclaration.kt similarity index 100% rename from j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.kt rename to j2k/tests/testData/fileOrElement/declarationStatement/singleFinalStringDeclaration.kt diff --git a/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.java b/j2k/tests/testData/fileOrElement/declarationStatement/singleIntDeclaration.java similarity index 100% rename from j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.java rename to j2k/tests/testData/fileOrElement/declarationStatement/singleIntDeclaration.java diff --git a/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.kt b/j2k/tests/testData/fileOrElement/declarationStatement/singleIntDeclaration.kt similarity index 100% rename from j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.kt rename to j2k/tests/testData/fileOrElement/declarationStatement/singleIntDeclaration.kt diff --git a/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.java b/j2k/tests/testData/fileOrElement/declarationStatement/singleStringDeclaration.java similarity index 100% rename from j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.java rename to j2k/tests/testData/fileOrElement/declarationStatement/singleStringDeclaration.java diff --git a/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.kt b/j2k/tests/testData/fileOrElement/declarationStatement/singleStringDeclaration.kt similarity index 100% rename from j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.kt rename to j2k/tests/testData/fileOrElement/declarationStatement/singleStringDeclaration.kt diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.java b/j2k/tests/testData/fileOrElement/doWhileStatement/whileWithBlock.java similarity index 100% rename from j2k/tests/testData/ast/doWhileStatement/whileWithBlock.java rename to j2k/tests/testData/fileOrElement/doWhileStatement/whileWithBlock.java diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.kt b/j2k/tests/testData/fileOrElement/doWhileStatement/whileWithBlock.kt similarity index 100% rename from j2k/tests/testData/ast/doWhileStatement/whileWithBlock.kt rename to j2k/tests/testData/fileOrElement/doWhileStatement/whileWithBlock.kt diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.java b/j2k/tests/testData/fileOrElement/doWhileStatement/whileWithEmptyBlock.java similarity index 100% rename from j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.java rename to j2k/tests/testData/fileOrElement/doWhileStatement/whileWithEmptyBlock.java diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.kt b/j2k/tests/testData/fileOrElement/doWhileStatement/whileWithEmptyBlock.kt similarity index 100% rename from j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.kt rename to j2k/tests/testData/fileOrElement/doWhileStatement/whileWithEmptyBlock.kt diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithExpression.java b/j2k/tests/testData/fileOrElement/doWhileStatement/whileWithExpression.java similarity index 100% rename from j2k/tests/testData/ast/doWhileStatement/whileWithExpression.java rename to j2k/tests/testData/fileOrElement/doWhileStatement/whileWithExpression.java diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithExpression.kt b/j2k/tests/testData/fileOrElement/doWhileStatement/whileWithExpression.kt similarity index 100% rename from j2k/tests/testData/ast/doWhileStatement/whileWithExpression.kt rename to j2k/tests/testData/fileOrElement/doWhileStatement/whileWithExpression.kt diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithReturn.java b/j2k/tests/testData/fileOrElement/doWhileStatement/whileWithReturn.java similarity index 100% rename from j2k/tests/testData/ast/doWhileStatement/whileWithReturn.java rename to j2k/tests/testData/fileOrElement/doWhileStatement/whileWithReturn.java diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithReturn.kt b/j2k/tests/testData/fileOrElement/doWhileStatement/whileWithReturn.kt similarity index 100% rename from j2k/tests/testData/ast/doWhileStatement/whileWithReturn.kt rename to j2k/tests/testData/fileOrElement/doWhileStatement/whileWithReturn.kt diff --git a/j2k/tests/testData/ast/dropAccessors/AccessInGetterWithThis.java b/j2k/tests/testData/fileOrElement/dropAccessors/AccessInGetterWithThis.java similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/AccessInGetterWithThis.java rename to j2k/tests/testData/fileOrElement/dropAccessors/AccessInGetterWithThis.java diff --git a/j2k/tests/testData/ast/dropAccessors/AccessInGetterWithThis.kt b/j2k/tests/testData/fileOrElement/dropAccessors/AccessInGetterWithThis.kt similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/AccessInGetterWithThis.kt rename to j2k/tests/testData/fileOrElement/dropAccessors/AccessInGetterWithThis.kt diff --git a/j2k/tests/testData/ast/dropAccessors/CannotDropOnlySetter.java b/j2k/tests/testData/fileOrElement/dropAccessors/CannotDropOnlySetter.java similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/CannotDropOnlySetter.java rename to j2k/tests/testData/fileOrElement/dropAccessors/CannotDropOnlySetter.java diff --git a/j2k/tests/testData/ast/dropAccessors/CannotDropOnlySetter.kt b/j2k/tests/testData/fileOrElement/dropAccessors/CannotDropOnlySetter.kt similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/CannotDropOnlySetter.kt rename to j2k/tests/testData/fileOrElement/dropAccessors/CannotDropOnlySetter.kt diff --git a/j2k/tests/testData/ast/dropAccessors/DataClass.java b/j2k/tests/testData/fileOrElement/dropAccessors/DataClass.java similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/DataClass.java rename to j2k/tests/testData/fileOrElement/dropAccessors/DataClass.java diff --git a/j2k/tests/testData/ast/dropAccessors/DataClass.kt b/j2k/tests/testData/fileOrElement/dropAccessors/DataClass.kt similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/DataClass.kt rename to j2k/tests/testData/fileOrElement/dropAccessors/DataClass.kt diff --git a/j2k/tests/testData/ast/dropAccessors/DataClassWithMutableField.java b/j2k/tests/testData/fileOrElement/dropAccessors/DataClassWithMutableField.java similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/DataClassWithMutableField.java rename to j2k/tests/testData/fileOrElement/dropAccessors/DataClassWithMutableField.java diff --git a/j2k/tests/testData/ast/dropAccessors/DataClassWithMutableField.kt b/j2k/tests/testData/fileOrElement/dropAccessors/DataClassWithMutableField.kt similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/DataClassWithMutableField.kt rename to j2k/tests/testData/fileOrElement/dropAccessors/DataClassWithMutableField.kt diff --git a/j2k/tests/testData/ast/dropAccessors/DifferentFieldName.java b/j2k/tests/testData/fileOrElement/dropAccessors/DifferentFieldName.java similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/DifferentFieldName.java rename to j2k/tests/testData/fileOrElement/dropAccessors/DifferentFieldName.java diff --git a/j2k/tests/testData/ast/dropAccessors/DifferentFieldName.kt b/j2k/tests/testData/fileOrElement/dropAccessors/DifferentFieldName.kt similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/DifferentFieldName.kt rename to j2k/tests/testData/fileOrElement/dropAccessors/DifferentFieldName.kt diff --git a/j2k/tests/testData/ast/dropAccessors/DifferentFieldNameAndDefaultParameterValue.java b/j2k/tests/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.java similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/DifferentFieldNameAndDefaultParameterValue.java rename to j2k/tests/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.java diff --git a/j2k/tests/testData/ast/dropAccessors/DifferentFieldNameAndDefaultParameterValue.kt b/j2k/tests/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.kt similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/DifferentFieldNameAndDefaultParameterValue.kt rename to j2k/tests/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.kt diff --git a/j2k/tests/testData/ast/dropAccessors/DifferentFieldNameAndSuperClass.java b/j2k/tests/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.java similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/DifferentFieldNameAndSuperClass.java rename to j2k/tests/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.java diff --git a/j2k/tests/testData/ast/dropAccessors/DifferentFieldNameAndSuperClass.kt b/j2k/tests/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.kt similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/DifferentFieldNameAndSuperClass.kt rename to j2k/tests/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.kt diff --git a/j2k/tests/testData/ast/dropAccessors/DifferentProtectedFieldName.java b/j2k/tests/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.java similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/DifferentProtectedFieldName.java rename to j2k/tests/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.java diff --git a/j2k/tests/testData/ast/dropAccessors/DifferentProtectedFieldName.kt b/j2k/tests/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.kt similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/DifferentProtectedFieldName.kt rename to j2k/tests/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.kt diff --git a/j2k/tests/testData/ast/dropAccessors/DropGetter.java b/j2k/tests/testData/fileOrElement/dropAccessors/DropGetter.java similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/DropGetter.java rename to j2k/tests/testData/fileOrElement/dropAccessors/DropGetter.java diff --git a/j2k/tests/testData/ast/dropAccessors/DropGetter.kt b/j2k/tests/testData/fileOrElement/dropAccessors/DropGetter.kt similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/DropGetter.kt rename to j2k/tests/testData/fileOrElement/dropAccessors/DropGetter.kt diff --git a/j2k/tests/testData/ast/dropAccessors/DropGetterAndSetter.java b/j2k/tests/testData/fileOrElement/dropAccessors/DropGetterAndSetter.java similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/DropGetterAndSetter.java rename to j2k/tests/testData/fileOrElement/dropAccessors/DropGetterAndSetter.java diff --git a/j2k/tests/testData/ast/dropAccessors/DropGetterAndSetter.kt b/j2k/tests/testData/fileOrElement/dropAccessors/DropGetterAndSetter.kt similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/DropGetterAndSetter.kt rename to j2k/tests/testData/fileOrElement/dropAccessors/DropGetterAndSetter.kt diff --git a/j2k/tests/testData/ast/dropAccessors/DropGetterForMutable.java b/j2k/tests/testData/fileOrElement/dropAccessors/DropGetterForMutable.java similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/DropGetterForMutable.java rename to j2k/tests/testData/fileOrElement/dropAccessors/DropGetterForMutable.java diff --git a/j2k/tests/testData/ast/dropAccessors/DropGetterForMutable.kt b/j2k/tests/testData/fileOrElement/dropAccessors/DropGetterForMutable.kt similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/DropGetterForMutable.kt rename to j2k/tests/testData/fileOrElement/dropAccessors/DropGetterForMutable.kt diff --git a/j2k/tests/testData/ast/dropAccessors/FalseGetter.java b/j2k/tests/testData/fileOrElement/dropAccessors/FalseGetter.java similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/FalseGetter.java rename to j2k/tests/testData/fileOrElement/dropAccessors/FalseGetter.java diff --git a/j2k/tests/testData/ast/dropAccessors/FalseGetter.kt b/j2k/tests/testData/fileOrElement/dropAccessors/FalseGetter.kt similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/FalseGetter.kt rename to j2k/tests/testData/fileOrElement/dropAccessors/FalseGetter.kt diff --git a/j2k/tests/testData/ast/dropAccessors/FalseSetter.java b/j2k/tests/testData/fileOrElement/dropAccessors/FalseSetter.java similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/FalseSetter.java rename to j2k/tests/testData/fileOrElement/dropAccessors/FalseSetter.java diff --git a/j2k/tests/testData/ast/dropAccessors/FalseSetter.kt b/j2k/tests/testData/fileOrElement/dropAccessors/FalseSetter.kt similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/FalseSetter.kt rename to j2k/tests/testData/fileOrElement/dropAccessors/FalseSetter.kt diff --git a/j2k/tests/testData/ast/dropAccessors/FieldUsagesInFactoryMethods.java b/j2k/tests/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.java similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/FieldUsagesInFactoryMethods.java rename to j2k/tests/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.java diff --git a/j2k/tests/testData/ast/dropAccessors/FieldUsagesInFactoryMethods.kt b/j2k/tests/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.kt similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/FieldUsagesInFactoryMethods.kt rename to j2k/tests/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.kt diff --git a/j2k/tests/testData/ast/dropAccessors/GetterAndSetterNamesDifferent.java b/j2k/tests/testData/fileOrElement/dropAccessors/GetterAndSetterNamesDifferent.java similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/GetterAndSetterNamesDifferent.java rename to j2k/tests/testData/fileOrElement/dropAccessors/GetterAndSetterNamesDifferent.java diff --git a/j2k/tests/testData/ast/dropAccessors/GetterAndSetterNamesDifferent.kt b/j2k/tests/testData/fileOrElement/dropAccessors/GetterAndSetterNamesDifferent.kt similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/GetterAndSetterNamesDifferent.kt rename to j2k/tests/testData/fileOrElement/dropAccessors/GetterAndSetterNamesDifferent.kt diff --git a/j2k/tests/testData/ast/dropAccessors/GetterSetterUsages.java b/j2k/tests/testData/fileOrElement/dropAccessors/GetterSetterUsages.java similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/GetterSetterUsages.java rename to j2k/tests/testData/fileOrElement/dropAccessors/GetterSetterUsages.java diff --git a/j2k/tests/testData/ast/dropAccessors/GetterSetterUsages.kt b/j2k/tests/testData/fileOrElement/dropAccessors/GetterSetterUsages.kt similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/GetterSetterUsages.kt rename to j2k/tests/testData/fileOrElement/dropAccessors/GetterSetterUsages.kt diff --git a/j2k/tests/testData/ast/dropAccessors/QualifyFieldUsagesOnRename.java.todo b/j2k/tests/testData/fileOrElement/dropAccessors/QualifyFieldUsagesOnRename.java.todo similarity index 100% rename from j2k/tests/testData/ast/dropAccessors/QualifyFieldUsagesOnRename.java.todo rename to j2k/tests/testData/fileOrElement/dropAccessors/QualifyFieldUsagesOnRename.java.todo diff --git a/j2k/tests/testData/ast/enum/colorEnum.java b/j2k/tests/testData/fileOrElement/enum/colorEnum.java similarity index 100% rename from j2k/tests/testData/ast/enum/colorEnum.java rename to j2k/tests/testData/fileOrElement/enum/colorEnum.java diff --git a/j2k/tests/testData/ast/enum/colorEnum.kt b/j2k/tests/testData/fileOrElement/enum/colorEnum.kt similarity index 100% rename from j2k/tests/testData/ast/enum/colorEnum.kt rename to j2k/tests/testData/fileOrElement/enum/colorEnum.kt diff --git a/j2k/tests/testData/ast/enum/emptyEnum.java b/j2k/tests/testData/fileOrElement/enum/emptyEnum.java similarity index 100% rename from j2k/tests/testData/ast/enum/emptyEnum.java rename to j2k/tests/testData/fileOrElement/enum/emptyEnum.java diff --git a/j2k/tests/testData/ast/enum/emptyEnum.kt b/j2k/tests/testData/fileOrElement/enum/emptyEnum.kt similarity index 100% rename from j2k/tests/testData/ast/enum/emptyEnum.kt rename to j2k/tests/testData/fileOrElement/enum/emptyEnum.kt diff --git a/j2k/tests/testData/ast/enum/enumConstantIsNotNull.java b/j2k/tests/testData/fileOrElement/enum/enumConstantIsNotNull.java similarity index 100% rename from j2k/tests/testData/ast/enum/enumConstantIsNotNull.java rename to j2k/tests/testData/fileOrElement/enum/enumConstantIsNotNull.java diff --git a/j2k/tests/testData/ast/enum/enumConstantIsNotNull.kt b/j2k/tests/testData/fileOrElement/enum/enumConstantIsNotNull.kt similarity index 100% rename from j2k/tests/testData/ast/enum/enumConstantIsNotNull.kt rename to j2k/tests/testData/fileOrElement/enum/enumConstantIsNotNull.kt diff --git a/j2k/tests/testData/ast/enum/enumImplementsOneInterface.java b/j2k/tests/testData/fileOrElement/enum/enumImplementsOneInterface.java similarity index 100% rename from j2k/tests/testData/ast/enum/enumImplementsOneInterface.java rename to j2k/tests/testData/fileOrElement/enum/enumImplementsOneInterface.java diff --git a/j2k/tests/testData/ast/enum/enumImplementsOneInterface.kt b/j2k/tests/testData/fileOrElement/enum/enumImplementsOneInterface.kt similarity index 100% rename from j2k/tests/testData/ast/enum/enumImplementsOneInterface.kt rename to j2k/tests/testData/fileOrElement/enum/enumImplementsOneInterface.kt diff --git a/j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.java b/j2k/tests/testData/fileOrElement/enum/enumImplementsSeveralInterfaces.java similarity index 100% rename from j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.java rename to j2k/tests/testData/fileOrElement/enum/enumImplementsSeveralInterfaces.java diff --git a/j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.kt b/j2k/tests/testData/fileOrElement/enum/enumImplementsSeveralInterfaces.kt similarity index 100% rename from j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.kt rename to j2k/tests/testData/fileOrElement/enum/enumImplementsSeveralInterfaces.kt diff --git a/j2k/tests/testData/ast/enum/enumWithNameField.java b/j2k/tests/testData/fileOrElement/enum/enumWithNameField.java similarity index 100% rename from j2k/tests/testData/ast/enum/enumWithNameField.java rename to j2k/tests/testData/fileOrElement/enum/enumWithNameField.java diff --git a/j2k/tests/testData/ast/enum/enumWithNameField.kt b/j2k/tests/testData/fileOrElement/enum/enumWithNameField.kt similarity index 100% rename from j2k/tests/testData/ast/enum/enumWithNameField.kt rename to j2k/tests/testData/fileOrElement/enum/enumWithNameField.kt diff --git a/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.java b/j2k/tests/testData/fileOrElement/enum/fieldsWithPrimaryPrivateConstructor.java similarity index 100% rename from j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.java rename to j2k/tests/testData/fileOrElement/enum/fieldsWithPrimaryPrivateConstructor.java diff --git a/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.kt b/j2k/tests/testData/fileOrElement/enum/fieldsWithPrimaryPrivateConstructor.kt similarity index 100% rename from j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.kt rename to j2k/tests/testData/fileOrElement/enum/fieldsWithPrimaryPrivateConstructor.kt diff --git a/j2k/tests/testData/ast/enum/internalEnum.java b/j2k/tests/testData/fileOrElement/enum/internalEnum.java similarity index 100% rename from j2k/tests/testData/ast/enum/internalEnum.java rename to j2k/tests/testData/fileOrElement/enum/internalEnum.java diff --git a/j2k/tests/testData/ast/enum/internalEnum.kt b/j2k/tests/testData/fileOrElement/enum/internalEnum.kt similarity index 100% rename from j2k/tests/testData/ast/enum/internalEnum.kt rename to j2k/tests/testData/fileOrElement/enum/internalEnum.kt diff --git a/j2k/tests/testData/ast/enum/overrideToString.java b/j2k/tests/testData/fileOrElement/enum/overrideToString.java similarity index 100% rename from j2k/tests/testData/ast/enum/overrideToString.java rename to j2k/tests/testData/fileOrElement/enum/overrideToString.java diff --git a/j2k/tests/testData/ast/enum/overrideToString.kt b/j2k/tests/testData/fileOrElement/enum/overrideToString.kt similarity index 100% rename from j2k/tests/testData/ast/enum/overrideToString.kt rename to j2k/tests/testData/fileOrElement/enum/overrideToString.kt diff --git a/j2k/tests/testData/ast/enum/primaryPrivateConstructor.java b/j2k/tests/testData/fileOrElement/enum/primaryPrivateConstructor.java similarity index 100% rename from j2k/tests/testData/ast/enum/primaryPrivateConstructor.java rename to j2k/tests/testData/fileOrElement/enum/primaryPrivateConstructor.java diff --git a/j2k/tests/testData/ast/enum/primaryPrivateConstructor.kt b/j2k/tests/testData/fileOrElement/enum/primaryPrivateConstructor.kt similarity index 100% rename from j2k/tests/testData/ast/enum/primaryPrivateConstructor.kt rename to j2k/tests/testData/fileOrElement/enum/primaryPrivateConstructor.kt diff --git a/j2k/tests/testData/ast/enum/privateEnum.java b/j2k/tests/testData/fileOrElement/enum/privateEnum.java similarity index 100% rename from j2k/tests/testData/ast/enum/privateEnum.java rename to j2k/tests/testData/fileOrElement/enum/privateEnum.java diff --git a/j2k/tests/testData/ast/enum/privateEnum.kt b/j2k/tests/testData/fileOrElement/enum/privateEnum.kt similarity index 100% rename from j2k/tests/testData/ast/enum/privateEnum.kt rename to j2k/tests/testData/fileOrElement/enum/privateEnum.kt diff --git a/j2k/tests/testData/ast/enum/protectedEnum.java b/j2k/tests/testData/fileOrElement/enum/protectedEnum.java similarity index 100% rename from j2k/tests/testData/ast/enum/protectedEnum.java rename to j2k/tests/testData/fileOrElement/enum/protectedEnum.java diff --git a/j2k/tests/testData/ast/enum/protectedEnum.kt b/j2k/tests/testData/fileOrElement/enum/protectedEnum.kt similarity index 100% rename from j2k/tests/testData/ast/enum/protectedEnum.kt rename to j2k/tests/testData/fileOrElement/enum/protectedEnum.kt diff --git a/j2k/tests/testData/ast/enum/publicEnum.java b/j2k/tests/testData/fileOrElement/enum/publicEnum.java similarity index 100% rename from j2k/tests/testData/ast/enum/publicEnum.java rename to j2k/tests/testData/fileOrElement/enum/publicEnum.java diff --git a/j2k/tests/testData/ast/enum/publicEnum.kt b/j2k/tests/testData/fileOrElement/enum/publicEnum.kt similarity index 100% rename from j2k/tests/testData/ast/enum/publicEnum.kt rename to j2k/tests/testData/fileOrElement/enum/publicEnum.kt diff --git a/j2k/tests/testData/ast/enum/runnableImplementation.java b/j2k/tests/testData/fileOrElement/enum/runnableImplementation.java similarity index 100% rename from j2k/tests/testData/ast/enum/runnableImplementation.java rename to j2k/tests/testData/fileOrElement/enum/runnableImplementation.java diff --git a/j2k/tests/testData/ast/enum/runnableImplementation.kt b/j2k/tests/testData/fileOrElement/enum/runnableImplementation.kt similarity index 100% rename from j2k/tests/testData/ast/enum/runnableImplementation.kt rename to j2k/tests/testData/fileOrElement/enum/runnableImplementation.kt diff --git a/j2k/tests/testData/ast/enum/typeSafeEnum.java b/j2k/tests/testData/fileOrElement/enum/typeSafeEnum.java similarity index 100% rename from j2k/tests/testData/ast/enum/typeSafeEnum.java rename to j2k/tests/testData/fileOrElement/enum/typeSafeEnum.java diff --git a/j2k/tests/testData/ast/enum/typeSafeEnum.kt b/j2k/tests/testData/fileOrElement/enum/typeSafeEnum.kt similarity index 100% rename from j2k/tests/testData/ast/enum/typeSafeEnum.kt rename to j2k/tests/testData/fileOrElement/enum/typeSafeEnum.kt diff --git a/j2k/tests/testData/ast/equals/Equals1.java b/j2k/tests/testData/fileOrElement/equals/Equals1.java similarity index 100% rename from j2k/tests/testData/ast/equals/Equals1.java rename to j2k/tests/testData/fileOrElement/equals/Equals1.java diff --git a/j2k/tests/testData/ast/equals/Equals1.kt b/j2k/tests/testData/fileOrElement/equals/Equals1.kt similarity index 100% rename from j2k/tests/testData/ast/equals/Equals1.kt rename to j2k/tests/testData/fileOrElement/equals/Equals1.kt diff --git a/j2k/tests/testData/ast/equals/Equals2.java b/j2k/tests/testData/fileOrElement/equals/Equals2.java similarity index 100% rename from j2k/tests/testData/ast/equals/Equals2.java rename to j2k/tests/testData/fileOrElement/equals/Equals2.java diff --git a/j2k/tests/testData/ast/equals/Equals2.kt b/j2k/tests/testData/fileOrElement/equals/Equals2.kt similarity index 100% rename from j2k/tests/testData/ast/equals/Equals2.kt rename to j2k/tests/testData/fileOrElement/equals/Equals2.kt diff --git a/j2k/tests/testData/ast/equals/Equals3.java b/j2k/tests/testData/fileOrElement/equals/Equals3.java similarity index 100% rename from j2k/tests/testData/ast/equals/Equals3.java rename to j2k/tests/testData/fileOrElement/equals/Equals3.java diff --git a/j2k/tests/testData/ast/equals/Equals3.kt b/j2k/tests/testData/fileOrElement/equals/Equals3.kt similarity index 100% rename from j2k/tests/testData/ast/equals/Equals3.kt rename to j2k/tests/testData/fileOrElement/equals/Equals3.kt diff --git a/j2k/tests/testData/ast/equals/Equals4.java b/j2k/tests/testData/fileOrElement/equals/Equals4.java similarity index 100% rename from j2k/tests/testData/ast/equals/Equals4.java rename to j2k/tests/testData/fileOrElement/equals/Equals4.java diff --git a/j2k/tests/testData/ast/equals/Equals4.kt b/j2k/tests/testData/fileOrElement/equals/Equals4.kt similarity index 100% rename from j2k/tests/testData/ast/equals/Equals4.kt rename to j2k/tests/testData/fileOrElement/equals/Equals4.kt diff --git a/j2k/tests/testData/ast/equals/ObjectsEquals.java b/j2k/tests/testData/fileOrElement/equals/ObjectsEquals.java similarity index 100% rename from j2k/tests/testData/ast/equals/ObjectsEquals.java rename to j2k/tests/testData/fileOrElement/equals/ObjectsEquals.java diff --git a/j2k/tests/testData/ast/equals/ObjectsEquals.kt b/j2k/tests/testData/fileOrElement/equals/ObjectsEquals.kt similarity index 100% rename from j2k/tests/testData/ast/equals/ObjectsEquals.kt rename to j2k/tests/testData/fileOrElement/equals/ObjectsEquals.kt diff --git a/j2k/tests/testData/ast/field/classChildExtendsBase.java b/j2k/tests/testData/fileOrElement/field/classChildExtendsBase.java similarity index 100% rename from j2k/tests/testData/ast/field/classChildExtendsBase.java rename to j2k/tests/testData/fileOrElement/field/classChildExtendsBase.java diff --git a/j2k/tests/testData/ast/field/classChildExtendsBase.kt b/j2k/tests/testData/fileOrElement/field/classChildExtendsBase.kt similarity index 100% rename from j2k/tests/testData/ast/field/classChildExtendsBase.kt rename to j2k/tests/testData/fileOrElement/field/classChildExtendsBase.kt diff --git a/j2k/tests/testData/ast/field/conversion.java b/j2k/tests/testData/fileOrElement/field/conversion.java similarity index 100% rename from j2k/tests/testData/ast/field/conversion.java rename to j2k/tests/testData/fileOrElement/field/conversion.java diff --git a/j2k/tests/testData/ast/field/conversion.kt b/j2k/tests/testData/fileOrElement/field/conversion.kt similarity index 100% rename from j2k/tests/testData/ast/field/conversion.kt rename to j2k/tests/testData/fileOrElement/field/conversion.kt diff --git a/j2k/tests/testData/ast/field/internalField.java b/j2k/tests/testData/fileOrElement/field/internalField.java similarity index 100% rename from j2k/tests/testData/ast/field/internalField.java rename to j2k/tests/testData/fileOrElement/field/internalField.java diff --git a/j2k/tests/testData/ast/field/internalField.kt b/j2k/tests/testData/fileOrElement/field/internalField.kt similarity index 100% rename from j2k/tests/testData/ast/field/internalField.kt rename to j2k/tests/testData/fileOrElement/field/internalField.kt diff --git a/j2k/tests/testData/ast/field/privateField.java b/j2k/tests/testData/fileOrElement/field/privateField.java similarity index 100% rename from j2k/tests/testData/ast/field/privateField.java rename to j2k/tests/testData/fileOrElement/field/privateField.java diff --git a/j2k/tests/testData/ast/field/privateField.kt b/j2k/tests/testData/fileOrElement/field/privateField.kt similarity index 100% rename from j2k/tests/testData/ast/field/privateField.kt rename to j2k/tests/testData/fileOrElement/field/privateField.kt diff --git a/j2k/tests/testData/ast/field/protectedField.java b/j2k/tests/testData/fileOrElement/field/protectedField.java similarity index 100% rename from j2k/tests/testData/ast/field/protectedField.java rename to j2k/tests/testData/fileOrElement/field/protectedField.java diff --git a/j2k/tests/testData/ast/field/protectedField.kt b/j2k/tests/testData/fileOrElement/field/protectedField.kt similarity index 100% rename from j2k/tests/testData/ast/field/protectedField.kt rename to j2k/tests/testData/fileOrElement/field/protectedField.kt diff --git a/j2k/tests/testData/ast/field/publicField.java b/j2k/tests/testData/fileOrElement/field/publicField.java similarity index 100% rename from j2k/tests/testData/ast/field/publicField.java rename to j2k/tests/testData/fileOrElement/field/publicField.java diff --git a/j2k/tests/testData/ast/field/publicField.kt b/j2k/tests/testData/fileOrElement/field/publicField.kt similarity index 100% rename from j2k/tests/testData/ast/field/publicField.kt rename to j2k/tests/testData/fileOrElement/field/publicField.kt diff --git a/j2k/tests/testData/ast/field/specifyType.java b/j2k/tests/testData/fileOrElement/field/specifyType.java similarity index 100% rename from j2k/tests/testData/ast/field/specifyType.java rename to j2k/tests/testData/fileOrElement/field/specifyType.java diff --git a/j2k/tests/testData/ast/field/specifyType.kt b/j2k/tests/testData/fileOrElement/field/specifyType.kt similarity index 100% rename from j2k/tests/testData/ast/field/specifyType.kt rename to j2k/tests/testData/fileOrElement/field/specifyType.kt diff --git a/j2k/tests/testData/ast/field/valOrVar.java b/j2k/tests/testData/fileOrElement/field/valOrVar.java similarity index 100% rename from j2k/tests/testData/ast/field/valOrVar.java rename to j2k/tests/testData/fileOrElement/field/valOrVar.java diff --git a/j2k/tests/testData/ast/field/valOrVar.kt b/j2k/tests/testData/fileOrElement/field/valOrVar.kt similarity index 100% rename from j2k/tests/testData/ast/field/valOrVar.kt rename to j2k/tests/testData/fileOrElement/field/valOrVar.kt diff --git a/j2k/tests/testData/ast/field/valWithInit.java b/j2k/tests/testData/fileOrElement/field/valWithInit.java similarity index 100% rename from j2k/tests/testData/ast/field/valWithInit.java rename to j2k/tests/testData/fileOrElement/field/valWithInit.java diff --git a/j2k/tests/testData/ast/field/valWithInit.kt b/j2k/tests/testData/fileOrElement/field/valWithInit.kt similarity index 100% rename from j2k/tests/testData/ast/field/valWithInit.kt rename to j2k/tests/testData/fileOrElement/field/valWithInit.kt diff --git a/j2k/tests/testData/ast/field/varWithInit.java b/j2k/tests/testData/fileOrElement/field/varWithInit.java similarity index 100% rename from j2k/tests/testData/ast/field/varWithInit.java rename to j2k/tests/testData/fileOrElement/field/varWithInit.java diff --git a/j2k/tests/testData/ast/field/varWithInit.kt b/j2k/tests/testData/fileOrElement/field/varWithInit.kt similarity index 100% rename from j2k/tests/testData/ast/field/varWithInit.kt rename to j2k/tests/testData/fileOrElement/field/varWithInit.kt diff --git a/j2k/tests/testData/ast/field/varWithoutInit.java b/j2k/tests/testData/fileOrElement/field/varWithoutInit.java similarity index 100% rename from j2k/tests/testData/ast/field/varWithoutInit.java rename to j2k/tests/testData/fileOrElement/field/varWithoutInit.java diff --git a/j2k/tests/testData/ast/field/varWithoutInit.kt b/j2k/tests/testData/fileOrElement/field/varWithoutInit.kt similarity index 100% rename from j2k/tests/testData/ast/field/varWithoutInit.kt rename to j2k/tests/testData/fileOrElement/field/varWithoutInit.kt diff --git a/j2k/tests/testData/ast/field/volatileTransientAndStrictFp.java b/j2k/tests/testData/fileOrElement/field/volatileTransientAndStrictFp.java similarity index 100% rename from j2k/tests/testData/ast/field/volatileTransientAndStrictFp.java rename to j2k/tests/testData/fileOrElement/field/volatileTransientAndStrictFp.java diff --git a/j2k/tests/testData/ast/field/volatileTransientAndStrictFp.kt b/j2k/tests/testData/fileOrElement/field/volatileTransientAndStrictFp.kt similarity index 100% rename from j2k/tests/testData/ast/field/volatileTransientAndStrictFp.kt rename to j2k/tests/testData/fileOrElement/field/volatileTransientAndStrictFp.kt diff --git a/j2k/tests/testData/ast/for/commonCaseForTest.java b/j2k/tests/testData/fileOrElement/for/commonCaseForTest.java similarity index 100% rename from j2k/tests/testData/ast/for/commonCaseForTest.java rename to j2k/tests/testData/fileOrElement/for/commonCaseForTest.java diff --git a/j2k/tests/testData/ast/for/commonCaseForTest.kt b/j2k/tests/testData/fileOrElement/for/commonCaseForTest.kt similarity index 100% rename from j2k/tests/testData/ast/for/commonCaseForTest.kt rename to j2k/tests/testData/fileOrElement/for/commonCaseForTest.kt diff --git a/j2k/tests/testData/ast/for/falseForRange.java b/j2k/tests/testData/fileOrElement/for/falseForRange.java similarity index 100% rename from j2k/tests/testData/ast/for/falseForRange.java rename to j2k/tests/testData/fileOrElement/for/falseForRange.java diff --git a/j2k/tests/testData/ast/for/falseForRange.kt b/j2k/tests/testData/fileOrElement/for/falseForRange.kt similarity index 100% rename from j2k/tests/testData/ast/for/falseForRange.kt rename to j2k/tests/testData/fileOrElement/for/falseForRange.kt diff --git a/j2k/tests/testData/ast/for/forRangeWithBlock.java b/j2k/tests/testData/fileOrElement/for/forRangeWithBlock.java similarity index 100% rename from j2k/tests/testData/ast/for/forRangeWithBlock.java rename to j2k/tests/testData/fileOrElement/for/forRangeWithBlock.java diff --git a/j2k/tests/testData/ast/for/forRangeWithBlock.kt b/j2k/tests/testData/fileOrElement/for/forRangeWithBlock.kt similarity index 100% rename from j2k/tests/testData/ast/for/forRangeWithBlock.kt rename to j2k/tests/testData/fileOrElement/for/forRangeWithBlock.kt diff --git a/j2k/tests/testData/ast/for/forRangeWithLE.java b/j2k/tests/testData/fileOrElement/for/forRangeWithLE.java similarity index 100% rename from j2k/tests/testData/ast/for/forRangeWithLE.java rename to j2k/tests/testData/fileOrElement/for/forRangeWithLE.java diff --git a/j2k/tests/testData/ast/for/forRangeWithLE.kt b/j2k/tests/testData/fileOrElement/for/forRangeWithLE.kt similarity index 100% rename from j2k/tests/testData/ast/for/forRangeWithLE.kt rename to j2k/tests/testData/fileOrElement/for/forRangeWithLE.kt diff --git a/j2k/tests/testData/ast/for/forRangeWithLT.java b/j2k/tests/testData/fileOrElement/for/forRangeWithLT.java similarity index 100% rename from j2k/tests/testData/ast/for/forRangeWithLT.java rename to j2k/tests/testData/fileOrElement/for/forRangeWithLT.java diff --git a/j2k/tests/testData/ast/for/forRangeWithLT.kt b/j2k/tests/testData/fileOrElement/for/forRangeWithLT.kt similarity index 100% rename from j2k/tests/testData/ast/for/forRangeWithLT.kt rename to j2k/tests/testData/fileOrElement/for/forRangeWithLT.kt diff --git a/j2k/tests/testData/ast/for/forThroughArrayIndices.java b/j2k/tests/testData/fileOrElement/for/forThroughArrayIndices.java similarity index 100% rename from j2k/tests/testData/ast/for/forThroughArrayIndices.java rename to j2k/tests/testData/fileOrElement/for/forThroughArrayIndices.java diff --git a/j2k/tests/testData/ast/for/forThroughArrayIndices.kt b/j2k/tests/testData/fileOrElement/for/forThroughArrayIndices.kt similarity index 100% rename from j2k/tests/testData/ast/for/forThroughArrayIndices.kt rename to j2k/tests/testData/fileOrElement/for/forThroughArrayIndices.kt diff --git a/j2k/tests/testData/ast/for/forThroughListIndices.java b/j2k/tests/testData/fileOrElement/for/forThroughListIndices.java similarity index 100% rename from j2k/tests/testData/ast/for/forThroughListIndices.java rename to j2k/tests/testData/fileOrElement/for/forThroughListIndices.java diff --git a/j2k/tests/testData/ast/for/forThroughListIndices.kt b/j2k/tests/testData/fileOrElement/for/forThroughListIndices.kt similarity index 100% rename from j2k/tests/testData/ast/for/forThroughListIndices.kt rename to j2k/tests/testData/fileOrElement/for/forThroughListIndices.kt diff --git a/j2k/tests/testData/ast/for/forThroughNonArrayIndices.java b/j2k/tests/testData/fileOrElement/for/forThroughNonArrayIndices.java similarity index 100% rename from j2k/tests/testData/ast/for/forThroughNonArrayIndices.java rename to j2k/tests/testData/fileOrElement/for/forThroughNonArrayIndices.java diff --git a/j2k/tests/testData/ast/for/forThroughNonArrayIndices.kt b/j2k/tests/testData/fileOrElement/for/forThroughNonArrayIndices.kt similarity index 100% rename from j2k/tests/testData/ast/for/forThroughNonArrayIndices.kt rename to j2k/tests/testData/fileOrElement/for/forThroughNonArrayIndices.kt diff --git a/j2k/tests/testData/ast/for/forThroughNonCollectionIndices.java b/j2k/tests/testData/fileOrElement/for/forThroughNonCollectionIndices.java similarity index 100% rename from j2k/tests/testData/ast/for/forThroughNonCollectionIndices.java rename to j2k/tests/testData/fileOrElement/for/forThroughNonCollectionIndices.java diff --git a/j2k/tests/testData/ast/for/forThroughNonCollectionIndices.kt b/j2k/tests/testData/fileOrElement/for/forThroughNonCollectionIndices.kt similarity index 100% rename from j2k/tests/testData/ast/for/forThroughNonCollectionIndices.kt rename to j2k/tests/testData/fileOrElement/for/forThroughNonCollectionIndices.kt diff --git a/j2k/tests/testData/ast/for/forWithBlock.java b/j2k/tests/testData/fileOrElement/for/forWithBlock.java similarity index 100% rename from j2k/tests/testData/ast/for/forWithBlock.java rename to j2k/tests/testData/fileOrElement/for/forWithBlock.java diff --git a/j2k/tests/testData/ast/for/forWithBlock.kt b/j2k/tests/testData/fileOrElement/for/forWithBlock.kt similarity index 100% rename from j2k/tests/testData/ast/for/forWithBlock.kt rename to j2k/tests/testData/fileOrElement/for/forWithBlock.kt diff --git a/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.java b/j2k/tests/testData/fileOrElement/for/forWithBlockAndDoubleUpdate.java similarity index 100% rename from j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.java rename to j2k/tests/testData/fileOrElement/for/forWithBlockAndDoubleUpdate.java diff --git a/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.kt b/j2k/tests/testData/fileOrElement/for/forWithBlockAndDoubleUpdate.kt similarity index 100% rename from j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.kt rename to j2k/tests/testData/fileOrElement/for/forWithBlockAndDoubleUpdate.kt diff --git a/j2k/tests/testData/ast/for/forWithEmptyBlock.java b/j2k/tests/testData/fileOrElement/for/forWithEmptyBlock.java similarity index 100% rename from j2k/tests/testData/ast/for/forWithEmptyBlock.java rename to j2k/tests/testData/fileOrElement/for/forWithEmptyBlock.java diff --git a/j2k/tests/testData/ast/for/forWithEmptyBlock.kt b/j2k/tests/testData/fileOrElement/for/forWithEmptyBlock.kt similarity index 100% rename from j2k/tests/testData/ast/for/forWithEmptyBlock.kt rename to j2k/tests/testData/fileOrElement/for/forWithEmptyBlock.kt diff --git a/j2k/tests/testData/ast/for/forWithExpression.java b/j2k/tests/testData/fileOrElement/for/forWithExpression.java similarity index 100% rename from j2k/tests/testData/ast/for/forWithExpression.java rename to j2k/tests/testData/fileOrElement/for/forWithExpression.java diff --git a/j2k/tests/testData/ast/for/forWithExpression.kt b/j2k/tests/testData/fileOrElement/for/forWithExpression.kt similarity index 100% rename from j2k/tests/testData/ast/for/forWithExpression.kt rename to j2k/tests/testData/fileOrElement/for/forWithExpression.kt diff --git a/j2k/tests/testData/ast/for/forWithNullCondition.java b/j2k/tests/testData/fileOrElement/for/forWithNullCondition.java similarity index 100% rename from j2k/tests/testData/ast/for/forWithNullCondition.java rename to j2k/tests/testData/fileOrElement/for/forWithNullCondition.java diff --git a/j2k/tests/testData/ast/for/forWithNullCondition.kt b/j2k/tests/testData/fileOrElement/for/forWithNullCondition.kt similarity index 100% rename from j2k/tests/testData/ast/for/forWithNullCondition.kt rename to j2k/tests/testData/fileOrElement/for/forWithNullCondition.kt diff --git a/j2k/tests/testData/ast/for/forWithNullInit.java b/j2k/tests/testData/fileOrElement/for/forWithNullInit.java similarity index 100% rename from j2k/tests/testData/ast/for/forWithNullInit.java rename to j2k/tests/testData/fileOrElement/for/forWithNullInit.java diff --git a/j2k/tests/testData/ast/for/forWithNullInit.kt b/j2k/tests/testData/fileOrElement/for/forWithNullInit.kt similarity index 100% rename from j2k/tests/testData/ast/for/forWithNullInit.kt rename to j2k/tests/testData/fileOrElement/for/forWithNullInit.kt diff --git a/j2k/tests/testData/ast/for/forWithNullUpdate.java b/j2k/tests/testData/fileOrElement/for/forWithNullUpdate.java similarity index 100% rename from j2k/tests/testData/ast/for/forWithNullUpdate.java rename to j2k/tests/testData/fileOrElement/for/forWithNullUpdate.java diff --git a/j2k/tests/testData/ast/for/forWithNullUpdate.kt b/j2k/tests/testData/fileOrElement/for/forWithNullUpdate.kt similarity index 100% rename from j2k/tests/testData/ast/for/forWithNullUpdate.kt rename to j2k/tests/testData/fileOrElement/for/forWithNullUpdate.kt diff --git a/j2k/tests/testData/ast/for/forWithReturn.java b/j2k/tests/testData/fileOrElement/for/forWithReturn.java similarity index 100% rename from j2k/tests/testData/ast/for/forWithReturn.java rename to j2k/tests/testData/fileOrElement/for/forWithReturn.java diff --git a/j2k/tests/testData/ast/for/forWithReturn.kt b/j2k/tests/testData/fileOrElement/for/forWithReturn.kt similarity index 100% rename from j2k/tests/testData/ast/for/forWithReturn.kt rename to j2k/tests/testData/fileOrElement/for/forWithReturn.kt diff --git a/j2k/tests/testData/ast/for/infiniteFor.java b/j2k/tests/testData/fileOrElement/for/infiniteFor.java similarity index 100% rename from j2k/tests/testData/ast/for/infiniteFor.java rename to j2k/tests/testData/fileOrElement/for/infiniteFor.java diff --git a/j2k/tests/testData/ast/for/infiniteFor.kt b/j2k/tests/testData/fileOrElement/for/infiniteFor.kt similarity index 100% rename from j2k/tests/testData/ast/for/infiniteFor.kt rename to j2k/tests/testData/fileOrElement/for/infiniteFor.kt diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.java b/j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithBlock.java similarity index 100% rename from j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.java rename to j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithBlock.java diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.kt b/j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithBlock.kt similarity index 100% rename from j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.kt rename to j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithBlock.kt diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.java b/j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithEmptyBlock.java similarity index 100% rename from j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.java rename to j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithEmptyBlock.java diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.kt b/j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithEmptyBlock.kt similarity index 100% rename from j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.kt rename to j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithEmptyBlock.kt diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.java b/j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithExpression.java similarity index 100% rename from j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.java rename to j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithExpression.java diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.kt b/j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithExpression.kt similarity index 100% rename from j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.kt rename to j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithExpression.kt diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.java b/j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithReturn.java similarity index 100% rename from j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.java rename to j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithReturn.java diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.kt b/j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithReturn.kt similarity index 100% rename from j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.kt rename to j2k/tests/testData/fileOrElement/foreachStatement/enhancedForWithReturn.kt diff --git a/j2k/tests/testData/ast/foreachStatement/nullableIterable.java b/j2k/tests/testData/fileOrElement/foreachStatement/nullableIterable.java similarity index 100% rename from j2k/tests/testData/ast/foreachStatement/nullableIterable.java rename to j2k/tests/testData/fileOrElement/foreachStatement/nullableIterable.java diff --git a/j2k/tests/testData/ast/foreachStatement/nullableIterable.kt b/j2k/tests/testData/fileOrElement/foreachStatement/nullableIterable.kt similarity index 100% rename from j2k/tests/testData/ast/foreachStatement/nullableIterable.kt rename to j2k/tests/testData/fileOrElement/foreachStatement/nullableIterable.kt diff --git a/j2k/tests/testData/ast/formatting/nonStaticMembers.java b/j2k/tests/testData/fileOrElement/formatting/nonStaticMembers.java similarity index 100% rename from j2k/tests/testData/ast/formatting/nonStaticMembers.java rename to j2k/tests/testData/fileOrElement/formatting/nonStaticMembers.java diff --git a/j2k/tests/testData/ast/formatting/nonStaticMembers.kt b/j2k/tests/testData/fileOrElement/formatting/nonStaticMembers.kt similarity index 100% rename from j2k/tests/testData/ast/formatting/nonStaticMembers.kt rename to j2k/tests/testData/fileOrElement/formatting/nonStaticMembers.kt diff --git a/j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.java b/j2k/tests/testData/fileOrElement/formatting/nonStaticMembersWithComments.java similarity index 100% rename from j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.java rename to j2k/tests/testData/fileOrElement/formatting/nonStaticMembersWithComments.java diff --git a/j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.kt b/j2k/tests/testData/fileOrElement/formatting/nonStaticMembersWithComments.kt similarity index 100% rename from j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.kt rename to j2k/tests/testData/fileOrElement/formatting/nonStaticMembersWithComments.kt diff --git a/j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.java b/j2k/tests/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.java similarity index 100% rename from j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.java rename to j2k/tests/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.java diff --git a/j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.kt b/j2k/tests/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt similarity index 100% rename from j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.kt rename to j2k/tests/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt diff --git a/j2k/tests/testData/ast/formatting/staticMembersWithComments.java b/j2k/tests/testData/fileOrElement/formatting/staticMembersWithComments.java similarity index 100% rename from j2k/tests/testData/ast/formatting/staticMembersWithComments.java rename to j2k/tests/testData/fileOrElement/formatting/staticMembersWithComments.java diff --git a/j2k/tests/testData/ast/formatting/staticMembersWithComments.kt b/j2k/tests/testData/fileOrElement/formatting/staticMembersWithComments.kt similarity index 100% rename from j2k/tests/testData/ast/formatting/staticMembersWithComments.kt rename to j2k/tests/testData/fileOrElement/formatting/staticMembersWithComments.kt diff --git a/j2k/tests/testData/ast/function/abstractMethod.java b/j2k/tests/testData/fileOrElement/function/abstractMethod.java similarity index 100% rename from j2k/tests/testData/ast/function/abstractMethod.java rename to j2k/tests/testData/fileOrElement/function/abstractMethod.java diff --git a/j2k/tests/testData/ast/function/abstractMethod.kt b/j2k/tests/testData/fileOrElement/function/abstractMethod.kt similarity index 100% rename from j2k/tests/testData/ast/function/abstractMethod.kt rename to j2k/tests/testData/fileOrElement/function/abstractMethod.kt diff --git a/j2k/tests/testData/ast/function/classGenericParam.java b/j2k/tests/testData/fileOrElement/function/classGenericParam.java similarity index 100% rename from j2k/tests/testData/ast/function/classGenericParam.java rename to j2k/tests/testData/fileOrElement/function/classGenericParam.java diff --git a/j2k/tests/testData/ast/function/classGenericParam.kt b/j2k/tests/testData/fileOrElement/function/classGenericParam.kt similarity index 100% rename from j2k/tests/testData/ast/function/classGenericParam.kt rename to j2k/tests/testData/fileOrElement/function/classGenericParam.kt diff --git a/j2k/tests/testData/ast/function/emptyVoidMethod.java b/j2k/tests/testData/fileOrElement/function/emptyVoidMethod.java similarity index 100% rename from j2k/tests/testData/ast/function/emptyVoidMethod.java rename to j2k/tests/testData/fileOrElement/function/emptyVoidMethod.java diff --git a/j2k/tests/testData/ast/function/emptyVoidMethod.kt b/j2k/tests/testData/fileOrElement/function/emptyVoidMethod.kt similarity index 100% rename from j2k/tests/testData/ast/function/emptyVoidMethod.kt rename to j2k/tests/testData/fileOrElement/function/emptyVoidMethod.kt diff --git a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.java b/j2k/tests/testData/fileOrElement/function/extendsBaseWhichExtendsObject.java similarity index 100% rename from j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.java rename to j2k/tests/testData/fileOrElement/function/extendsBaseWhichExtendsObject.java diff --git a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt b/j2k/tests/testData/fileOrElement/function/extendsBaseWhichExtendsObject.kt similarity index 100% rename from j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt rename to j2k/tests/testData/fileOrElement/function/extendsBaseWhichExtendsObject.kt diff --git a/j2k/tests/testData/ast/function/final.java b/j2k/tests/testData/fileOrElement/function/final.java similarity index 100% rename from j2k/tests/testData/ast/function/final.java rename to j2k/tests/testData/fileOrElement/function/final.java diff --git a/j2k/tests/testData/ast/function/final.kt b/j2k/tests/testData/fileOrElement/function/final.kt similarity index 100% rename from j2k/tests/testData/ast/function/final.kt rename to j2k/tests/testData/fileOrElement/function/final.kt diff --git a/j2k/tests/testData/ast/function/functionInFinalClass.java b/j2k/tests/testData/fileOrElement/function/functionInFinalClass.java similarity index 100% rename from j2k/tests/testData/ast/function/functionInFinalClass.java rename to j2k/tests/testData/fileOrElement/function/functionInFinalClass.java diff --git a/j2k/tests/testData/ast/function/functionInFinalClass.kt b/j2k/tests/testData/fileOrElement/function/functionInFinalClass.kt similarity index 100% rename from j2k/tests/testData/ast/function/functionInFinalClass.kt rename to j2k/tests/testData/fileOrElement/function/functionInFinalClass.kt diff --git a/j2k/tests/testData/ast/function/internal.java b/j2k/tests/testData/fileOrElement/function/internal.java similarity index 100% rename from j2k/tests/testData/ast/function/internal.java rename to j2k/tests/testData/fileOrElement/function/internal.java diff --git a/j2k/tests/testData/ast/function/internal.kt b/j2k/tests/testData/fileOrElement/function/internal.kt similarity index 100% rename from j2k/tests/testData/ast/function/internal.kt rename to j2k/tests/testData/fileOrElement/function/internal.kt diff --git a/j2k/tests/testData/ast/function/main.java b/j2k/tests/testData/fileOrElement/function/main.java similarity index 100% rename from j2k/tests/testData/ast/function/main.java rename to j2k/tests/testData/fileOrElement/function/main.java diff --git a/j2k/tests/testData/ast/function/main.kt b/j2k/tests/testData/fileOrElement/function/main.kt similarity index 100% rename from j2k/tests/testData/ast/function/main.kt rename to j2k/tests/testData/fileOrElement/function/main.kt diff --git a/j2k/tests/testData/ast/function/main2.java b/j2k/tests/testData/fileOrElement/function/main2.java similarity index 100% rename from j2k/tests/testData/ast/function/main2.java rename to j2k/tests/testData/fileOrElement/function/main2.java diff --git a/j2k/tests/testData/ast/function/main2.kt b/j2k/tests/testData/fileOrElement/function/main2.kt similarity index 100% rename from j2k/tests/testData/ast/function/main2.kt rename to j2k/tests/testData/fileOrElement/function/main2.kt diff --git a/j2k/tests/testData/ast/function/mainAndNullabilitySetting.java b/j2k/tests/testData/fileOrElement/function/mainAndNullabilitySetting.java similarity index 100% rename from j2k/tests/testData/ast/function/mainAndNullabilitySetting.java rename to j2k/tests/testData/fileOrElement/function/mainAndNullabilitySetting.java diff --git a/j2k/tests/testData/ast/function/mainAndNullabilitySetting.kt b/j2k/tests/testData/fileOrElement/function/mainAndNullabilitySetting.kt similarity index 100% rename from j2k/tests/testData/ast/function/mainAndNullabilitySetting.kt rename to j2k/tests/testData/fileOrElement/function/mainAndNullabilitySetting.kt diff --git a/j2k/tests/testData/ast/function/methodClassType.java b/j2k/tests/testData/fileOrElement/function/methodClassType.java similarity index 100% rename from j2k/tests/testData/ast/function/methodClassType.java rename to j2k/tests/testData/fileOrElement/function/methodClassType.java diff --git a/j2k/tests/testData/ast/function/methodClassType.kt b/j2k/tests/testData/fileOrElement/function/methodClassType.kt similarity index 100% rename from j2k/tests/testData/ast/function/methodClassType.kt rename to j2k/tests/testData/fileOrElement/function/methodClassType.kt diff --git a/j2k/tests/testData/ast/function/methodPrimitiveType.java b/j2k/tests/testData/fileOrElement/function/methodPrimitiveType.java similarity index 100% rename from j2k/tests/testData/ast/function/methodPrimitiveType.java rename to j2k/tests/testData/fileOrElement/function/methodPrimitiveType.java diff --git a/j2k/tests/testData/ast/function/methodPrimitiveType.kt b/j2k/tests/testData/fileOrElement/function/methodPrimitiveType.kt similarity index 100% rename from j2k/tests/testData/ast/function/methodPrimitiveType.kt rename to j2k/tests/testData/fileOrElement/function/methodPrimitiveType.kt diff --git a/j2k/tests/testData/ast/function/methodPrimitiveType2.java b/j2k/tests/testData/fileOrElement/function/methodPrimitiveType2.java similarity index 100% rename from j2k/tests/testData/ast/function/methodPrimitiveType2.java rename to j2k/tests/testData/fileOrElement/function/methodPrimitiveType2.java diff --git a/j2k/tests/testData/ast/function/methodPrimitiveType2.kt b/j2k/tests/testData/fileOrElement/function/methodPrimitiveType2.kt similarity index 100% rename from j2k/tests/testData/ast/function/methodPrimitiveType2.kt rename to j2k/tests/testData/fileOrElement/function/methodPrimitiveType2.kt diff --git a/j2k/tests/testData/ast/function/methodWithReturnStatement.java b/j2k/tests/testData/fileOrElement/function/methodWithReturnStatement.java similarity index 100% rename from j2k/tests/testData/ast/function/methodWithReturnStatement.java rename to j2k/tests/testData/fileOrElement/function/methodWithReturnStatement.java diff --git a/j2k/tests/testData/ast/function/methodWithReturnStatement.kt b/j2k/tests/testData/fileOrElement/function/methodWithReturnStatement.kt similarity index 100% rename from j2k/tests/testData/ast/function/methodWithReturnStatement.kt rename to j2k/tests/testData/fileOrElement/function/methodWithReturnStatement.kt diff --git a/j2k/tests/testData/ast/function/open.java b/j2k/tests/testData/fileOrElement/function/open.java similarity index 100% rename from j2k/tests/testData/ast/function/open.java rename to j2k/tests/testData/fileOrElement/function/open.java diff --git a/j2k/tests/testData/ast/function/open.kt b/j2k/tests/testData/fileOrElement/function/open.kt similarity index 100% rename from j2k/tests/testData/ast/function/open.kt rename to j2k/tests/testData/fileOrElement/function/open.kt diff --git a/j2k/tests/testData/ast/function/override.java b/j2k/tests/testData/fileOrElement/function/override.java similarity index 100% rename from j2k/tests/testData/ast/function/override.java rename to j2k/tests/testData/fileOrElement/function/override.java diff --git a/j2k/tests/testData/ast/function/override.kt b/j2k/tests/testData/fileOrElement/function/override.kt similarity index 100% rename from j2k/tests/testData/ast/function/override.kt rename to j2k/tests/testData/fileOrElement/function/override.kt diff --git a/j2k/tests/testData/ast/function/overrideAndOpen.java b/j2k/tests/testData/fileOrElement/function/overrideAndOpen.java similarity index 100% rename from j2k/tests/testData/ast/function/overrideAndOpen.java rename to j2k/tests/testData/fileOrElement/function/overrideAndOpen.java diff --git a/j2k/tests/testData/ast/function/overrideAndOpen.kt b/j2k/tests/testData/fileOrElement/function/overrideAndOpen.kt similarity index 100% rename from j2k/tests/testData/ast/function/overrideAndOpen.kt rename to j2k/tests/testData/fileOrElement/function/overrideAndOpen.kt diff --git a/j2k/tests/testData/ast/function/overrideObject.java b/j2k/tests/testData/fileOrElement/function/overrideObject.java similarity index 100% rename from j2k/tests/testData/ast/function/overrideObject.java rename to j2k/tests/testData/fileOrElement/function/overrideObject.java diff --git a/j2k/tests/testData/ast/function/overrideObject.kt b/j2k/tests/testData/fileOrElement/function/overrideObject.kt similarity index 100% rename from j2k/tests/testData/ast/function/overrideObject.kt rename to j2k/tests/testData/fileOrElement/function/overrideObject.kt diff --git a/j2k/tests/testData/ast/function/overrideObject2.java b/j2k/tests/testData/fileOrElement/function/overrideObject2.java similarity index 100% rename from j2k/tests/testData/ast/function/overrideObject2.java rename to j2k/tests/testData/fileOrElement/function/overrideObject2.java diff --git a/j2k/tests/testData/ast/function/overrideObject2.kt b/j2k/tests/testData/fileOrElement/function/overrideObject2.kt similarity index 100% rename from j2k/tests/testData/ast/function/overrideObject2.kt rename to j2k/tests/testData/fileOrElement/function/overrideObject2.kt diff --git a/j2k/tests/testData/ast/function/overrideObject3.java b/j2k/tests/testData/fileOrElement/function/overrideObject3.java similarity index 100% rename from j2k/tests/testData/ast/function/overrideObject3.java rename to j2k/tests/testData/fileOrElement/function/overrideObject3.java diff --git a/j2k/tests/testData/ast/function/overrideObject3.kt b/j2k/tests/testData/fileOrElement/function/overrideObject3.kt similarity index 100% rename from j2k/tests/testData/ast/function/overrideObject3.kt rename to j2k/tests/testData/fileOrElement/function/overrideObject3.kt diff --git a/j2k/tests/testData/ast/function/ownGenericParam.java b/j2k/tests/testData/fileOrElement/function/ownGenericParam.java similarity index 100% rename from j2k/tests/testData/ast/function/ownGenericParam.java rename to j2k/tests/testData/fileOrElement/function/ownGenericParam.java diff --git a/j2k/tests/testData/ast/function/ownGenericParam.kt b/j2k/tests/testData/fileOrElement/function/ownGenericParam.kt similarity index 100% rename from j2k/tests/testData/ast/function/ownGenericParam.kt rename to j2k/tests/testData/fileOrElement/function/ownGenericParam.kt diff --git a/j2k/tests/testData/ast/function/ownSeveralGenericParams.java b/j2k/tests/testData/fileOrElement/function/ownSeveralGenericParams.java similarity index 100% rename from j2k/tests/testData/ast/function/ownSeveralGenericParams.java rename to j2k/tests/testData/fileOrElement/function/ownSeveralGenericParams.java diff --git a/j2k/tests/testData/ast/function/ownSeveralGenericParams.kt b/j2k/tests/testData/fileOrElement/function/ownSeveralGenericParams.kt similarity index 100% rename from j2k/tests/testData/ast/function/ownSeveralGenericParams.kt rename to j2k/tests/testData/fileOrElement/function/ownSeveralGenericParams.kt diff --git a/j2k/tests/testData/ast/function/parameterModification.java b/j2k/tests/testData/fileOrElement/function/parameterModification.java similarity index 100% rename from j2k/tests/testData/ast/function/parameterModification.java rename to j2k/tests/testData/fileOrElement/function/parameterModification.java diff --git a/j2k/tests/testData/ast/function/parameterModification.kt b/j2k/tests/testData/fileOrElement/function/parameterModification.kt similarity index 100% rename from j2k/tests/testData/ast/function/parameterModification.kt rename to j2k/tests/testData/fileOrElement/function/parameterModification.kt diff --git a/j2k/tests/testData/ast/function/private.java b/j2k/tests/testData/fileOrElement/function/private.java similarity index 100% rename from j2k/tests/testData/ast/function/private.java rename to j2k/tests/testData/fileOrElement/function/private.java diff --git a/j2k/tests/testData/ast/function/private.kt b/j2k/tests/testData/fileOrElement/function/private.kt similarity index 100% rename from j2k/tests/testData/ast/function/private.kt rename to j2k/tests/testData/fileOrElement/function/private.kt diff --git a/j2k/tests/testData/ast/function/protected.java b/j2k/tests/testData/fileOrElement/function/protected.java similarity index 100% rename from j2k/tests/testData/ast/function/protected.java rename to j2k/tests/testData/fileOrElement/function/protected.java diff --git a/j2k/tests/testData/ast/function/protected.kt b/j2k/tests/testData/fileOrElement/function/protected.kt similarity index 100% rename from j2k/tests/testData/ast/function/protected.kt rename to j2k/tests/testData/fileOrElement/function/protected.kt diff --git a/j2k/tests/testData/ast/function/public.java b/j2k/tests/testData/fileOrElement/function/public.java similarity index 100% rename from j2k/tests/testData/ast/function/public.java rename to j2k/tests/testData/fileOrElement/function/public.java diff --git a/j2k/tests/testData/ast/function/public.kt b/j2k/tests/testData/fileOrElement/function/public.kt similarity index 100% rename from j2k/tests/testData/ast/function/public.kt rename to j2k/tests/testData/fileOrElement/function/public.kt diff --git a/j2k/tests/testData/ast/function/synchronizedMethod.java b/j2k/tests/testData/fileOrElement/function/synchronizedMethod.java similarity index 100% rename from j2k/tests/testData/ast/function/synchronizedMethod.java rename to j2k/tests/testData/fileOrElement/function/synchronizedMethod.java diff --git a/j2k/tests/testData/ast/function/synchronizedMethod.kt b/j2k/tests/testData/fileOrElement/function/synchronizedMethod.kt similarity index 100% rename from j2k/tests/testData/ast/function/synchronizedMethod.kt rename to j2k/tests/testData/fileOrElement/function/synchronizedMethod.kt diff --git a/j2k/tests/testData/ast/function/throws.java b/j2k/tests/testData/fileOrElement/function/throws.java similarity index 100% rename from j2k/tests/testData/ast/function/throws.java rename to j2k/tests/testData/fileOrElement/function/throws.java diff --git a/j2k/tests/testData/ast/function/throws.kt b/j2k/tests/testData/fileOrElement/function/throws.kt similarity index 100% rename from j2k/tests/testData/ast/function/throws.kt rename to j2k/tests/testData/fileOrElement/function/throws.kt diff --git a/j2k/tests/testData/ast/function/varVararg.java b/j2k/tests/testData/fileOrElement/function/varVararg.java similarity index 100% rename from j2k/tests/testData/ast/function/varVararg.java rename to j2k/tests/testData/fileOrElement/function/varVararg.java diff --git a/j2k/tests/testData/ast/function/varVararg.kt b/j2k/tests/testData/fileOrElement/function/varVararg.kt similarity index 100% rename from j2k/tests/testData/ast/function/varVararg.kt rename to j2k/tests/testData/fileOrElement/function/varVararg.kt diff --git a/j2k/tests/testData/ast/identifier/finalFieldReference.java b/j2k/tests/testData/fileOrElement/identifier/finalFieldReference.java similarity index 100% rename from j2k/tests/testData/ast/identifier/finalFieldReference.java rename to j2k/tests/testData/fileOrElement/identifier/finalFieldReference.java diff --git a/j2k/tests/testData/ast/identifier/finalFieldReference.kt b/j2k/tests/testData/fileOrElement/identifier/finalFieldReference.kt similarity index 100% rename from j2k/tests/testData/ast/identifier/finalFieldReference.kt rename to j2k/tests/testData/fileOrElement/identifier/finalFieldReference.kt diff --git a/j2k/tests/testData/ast/identifier/keywords.java b/j2k/tests/testData/fileOrElement/identifier/keywords.java similarity index 100% rename from j2k/tests/testData/ast/identifier/keywords.java rename to j2k/tests/testData/fileOrElement/identifier/keywords.java diff --git a/j2k/tests/testData/ast/identifier/keywords.kt b/j2k/tests/testData/fileOrElement/identifier/keywords.kt similarity index 100% rename from j2k/tests/testData/ast/identifier/keywords.kt rename to j2k/tests/testData/fileOrElement/identifier/keywords.kt diff --git a/j2k/tests/testData/ast/identifier/withDollar.java b/j2k/tests/testData/fileOrElement/identifier/withDollar.java similarity index 100% rename from j2k/tests/testData/ast/identifier/withDollar.java rename to j2k/tests/testData/fileOrElement/identifier/withDollar.java diff --git a/j2k/tests/testData/ast/identifier/withDollar.kt b/j2k/tests/testData/fileOrElement/identifier/withDollar.kt similarity index 100% rename from j2k/tests/testData/ast/identifier/withDollar.kt rename to j2k/tests/testData/fileOrElement/identifier/withDollar.kt diff --git a/j2k/tests/testData/ast/ifStatement/elseIf.java b/j2k/tests/testData/fileOrElement/ifStatement/elseIf.java similarity index 100% rename from j2k/tests/testData/ast/ifStatement/elseIf.java rename to j2k/tests/testData/fileOrElement/ifStatement/elseIf.java diff --git a/j2k/tests/testData/ast/ifStatement/elseIf.kt b/j2k/tests/testData/fileOrElement/ifStatement/elseIf.kt similarity index 100% rename from j2k/tests/testData/ast/ifStatement/elseIf.kt rename to j2k/tests/testData/fileOrElement/ifStatement/elseIf.kt diff --git a/j2k/tests/testData/ast/ifStatement/multiLine.java b/j2k/tests/testData/fileOrElement/ifStatement/multiLine.java similarity index 100% rename from j2k/tests/testData/ast/ifStatement/multiLine.java rename to j2k/tests/testData/fileOrElement/ifStatement/multiLine.java diff --git a/j2k/tests/testData/ast/ifStatement/multiLine.kt b/j2k/tests/testData/fileOrElement/ifStatement/multiLine.kt similarity index 100% rename from j2k/tests/testData/ast/ifStatement/multiLine.kt rename to j2k/tests/testData/fileOrElement/ifStatement/multiLine.kt diff --git a/j2k/tests/testData/ast/ifStatement/singleLine.java b/j2k/tests/testData/fileOrElement/ifStatement/singleLine.java similarity index 100% rename from j2k/tests/testData/ast/ifStatement/singleLine.java rename to j2k/tests/testData/fileOrElement/ifStatement/singleLine.java diff --git a/j2k/tests/testData/ast/ifStatement/singleLine.kt b/j2k/tests/testData/fileOrElement/ifStatement/singleLine.kt similarity index 100% rename from j2k/tests/testData/ast/ifStatement/singleLine.kt rename to j2k/tests/testData/fileOrElement/ifStatement/singleLine.kt diff --git a/j2k/tests/testData/ast/ifStatement/withBlocks.java b/j2k/tests/testData/fileOrElement/ifStatement/withBlocks.java similarity index 100% rename from j2k/tests/testData/ast/ifStatement/withBlocks.java rename to j2k/tests/testData/fileOrElement/ifStatement/withBlocks.java diff --git a/j2k/tests/testData/ast/ifStatement/withBlocks.kt b/j2k/tests/testData/fileOrElement/ifStatement/withBlocks.kt similarity index 100% rename from j2k/tests/testData/ast/ifStatement/withBlocks.kt rename to j2k/tests/testData/fileOrElement/ifStatement/withBlocks.kt diff --git a/j2k/tests/testData/ast/ifStatement/withEmptyBlocks.java b/j2k/tests/testData/fileOrElement/ifStatement/withEmptyBlocks.java similarity index 100% rename from j2k/tests/testData/ast/ifStatement/withEmptyBlocks.java rename to j2k/tests/testData/fileOrElement/ifStatement/withEmptyBlocks.java diff --git a/j2k/tests/testData/ast/ifStatement/withEmptyBlocks.kt b/j2k/tests/testData/fileOrElement/ifStatement/withEmptyBlocks.kt similarity index 100% rename from j2k/tests/testData/ast/ifStatement/withEmptyBlocks.kt rename to j2k/tests/testData/fileOrElement/ifStatement/withEmptyBlocks.kt diff --git a/j2k/tests/testData/ast/ifStatement/withoutElse.java b/j2k/tests/testData/fileOrElement/ifStatement/withoutElse.java similarity index 100% rename from j2k/tests/testData/ast/ifStatement/withoutElse.java rename to j2k/tests/testData/fileOrElement/ifStatement/withoutElse.java diff --git a/j2k/tests/testData/ast/ifStatement/withoutElse.kt b/j2k/tests/testData/fileOrElement/ifStatement/withoutElse.kt similarity index 100% rename from j2k/tests/testData/ast/ifStatement/withoutElse.kt rename to j2k/tests/testData/fileOrElement/ifStatement/withoutElse.kt diff --git a/j2k/tests/testData/ast/importStatement/importWithKeywords.java b/j2k/tests/testData/fileOrElement/importStatement/importWithKeywords.java similarity index 100% rename from j2k/tests/testData/ast/importStatement/importWithKeywords.java rename to j2k/tests/testData/fileOrElement/importStatement/importWithKeywords.java diff --git a/j2k/tests/testData/ast/importStatement/importWithKeywords.kt b/j2k/tests/testData/fileOrElement/importStatement/importWithKeywords.kt similarity index 100% rename from j2k/tests/testData/ast/importStatement/importWithKeywords.kt rename to j2k/tests/testData/fileOrElement/importStatement/importWithKeywords.kt diff --git a/j2k/tests/testData/ast/importStatement/importWithStar.java b/j2k/tests/testData/fileOrElement/importStatement/importWithStar.java similarity index 100% rename from j2k/tests/testData/ast/importStatement/importWithStar.java rename to j2k/tests/testData/fileOrElement/importStatement/importWithStar.java diff --git a/j2k/tests/testData/ast/importStatement/importWithStar.kt b/j2k/tests/testData/fileOrElement/importStatement/importWithStar.kt similarity index 100% rename from j2k/tests/testData/ast/importStatement/importWithStar.kt rename to j2k/tests/testData/fileOrElement/importStatement/importWithStar.kt diff --git a/j2k/tests/testData/ast/importStatement/oneImport.java b/j2k/tests/testData/fileOrElement/importStatement/oneImport.java similarity index 100% rename from j2k/tests/testData/ast/importStatement/oneImport.java rename to j2k/tests/testData/fileOrElement/importStatement/oneImport.java diff --git a/j2k/tests/testData/ast/importStatement/oneImport.kt b/j2k/tests/testData/fileOrElement/importStatement/oneImport.kt similarity index 100% rename from j2k/tests/testData/ast/importStatement/oneImport.kt rename to j2k/tests/testData/fileOrElement/importStatement/oneImport.kt diff --git a/j2k/tests/testData/ast/importStatement/onlyImports.java b/j2k/tests/testData/fileOrElement/importStatement/onlyImports.java similarity index 100% rename from j2k/tests/testData/ast/importStatement/onlyImports.java rename to j2k/tests/testData/fileOrElement/importStatement/onlyImports.java diff --git a/j2k/tests/testData/ast/importStatement/onlyImports.kt b/j2k/tests/testData/fileOrElement/importStatement/onlyImports.kt similarity index 100% rename from j2k/tests/testData/ast/importStatement/onlyImports.kt rename to j2k/tests/testData/fileOrElement/importStatement/onlyImports.kt diff --git a/j2k/tests/testData/ast/importStatement/simpleImport.java b/j2k/tests/testData/fileOrElement/importStatement/simpleImport.java similarity index 100% rename from j2k/tests/testData/ast/importStatement/simpleImport.java rename to j2k/tests/testData/fileOrElement/importStatement/simpleImport.java diff --git a/j2k/tests/testData/ast/importStatement/simpleImport.kt b/j2k/tests/testData/fileOrElement/importStatement/simpleImport.kt similarity index 100% rename from j2k/tests/testData/ast/importStatement/simpleImport.kt rename to j2k/tests/testData/fileOrElement/importStatement/simpleImport.kt diff --git a/j2k/tests/testData/ast/inProjectionType/methodParams.java b/j2k/tests/testData/fileOrElement/inProjectionType/methodParams.java similarity index 100% rename from j2k/tests/testData/ast/inProjectionType/methodParams.java rename to j2k/tests/testData/fileOrElement/inProjectionType/methodParams.java diff --git a/j2k/tests/testData/ast/inProjectionType/methodParams.kt b/j2k/tests/testData/fileOrElement/inProjectionType/methodParams.kt similarity index 100% rename from j2k/tests/testData/ast/inProjectionType/methodParams.kt rename to j2k/tests/testData/fileOrElement/inProjectionType/methodParams.kt diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.java b/j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseGeneric.java similarity index 100% rename from j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.java rename to j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseGeneric.java diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt b/j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseGeneric.kt similarity index 100% rename from j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt rename to j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseGeneric.kt diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.java b/j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseWithOneParam.java similarity index 100% rename from j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.java rename to j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseWithOneParam.java diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.kt b/j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseWithOneParam.kt similarity index 100% rename from j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.kt rename to j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseWithOneParam.kt diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.java b/j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParams.java similarity index 100% rename from j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.java rename to j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParams.java diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt b/j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParams.kt similarity index 100% rename from j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt rename to j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParams.kt diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.java b/j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.java similarity index 100% rename from j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.java rename to j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.java diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt b/j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt similarity index 100% rename from j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt rename to j2k/tests/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt diff --git a/j2k/tests/testData/ast/isOperator/complicatedExpression.java b/j2k/tests/testData/fileOrElement/isOperator/complicatedExpression.java similarity index 100% rename from j2k/tests/testData/ast/isOperator/complicatedExpression.java rename to j2k/tests/testData/fileOrElement/isOperator/complicatedExpression.java diff --git a/j2k/tests/testData/ast/isOperator/complicatedExpression.kt b/j2k/tests/testData/fileOrElement/isOperator/complicatedExpression.kt similarity index 100% rename from j2k/tests/testData/ast/isOperator/complicatedExpression.kt rename to j2k/tests/testData/fileOrElement/isOperator/complicatedExpression.kt diff --git a/j2k/tests/testData/ast/isOperator/simpleReference.java b/j2k/tests/testData/fileOrElement/isOperator/simpleReference.java similarity index 100% rename from j2k/tests/testData/ast/isOperator/simpleReference.java rename to j2k/tests/testData/fileOrElement/isOperator/simpleReference.java diff --git a/j2k/tests/testData/ast/isOperator/simpleReference.kt b/j2k/tests/testData/fileOrElement/isOperator/simpleReference.kt similarity index 100% rename from j2k/tests/testData/ast/isOperator/simpleReference.kt rename to j2k/tests/testData/fileOrElement/isOperator/simpleReference.kt diff --git a/j2k/tests/testData/ast/issues/arrayLength.java b/j2k/tests/testData/fileOrElement/issues/arrayLength.java similarity index 100% rename from j2k/tests/testData/ast/issues/arrayLength.java rename to j2k/tests/testData/fileOrElement/issues/arrayLength.java diff --git a/j2k/tests/testData/ast/issues/arrayLength.kt b/j2k/tests/testData/fileOrElement/issues/arrayLength.kt similarity index 100% rename from j2k/tests/testData/ast/issues/arrayLength.kt rename to j2k/tests/testData/fileOrElement/issues/arrayLength.kt diff --git a/j2k/tests/testData/ast/issues/comments.java b/j2k/tests/testData/fileOrElement/issues/comments.java similarity index 100% rename from j2k/tests/testData/ast/issues/comments.java rename to j2k/tests/testData/fileOrElement/issues/comments.java diff --git a/j2k/tests/testData/ast/issues/comments.kt b/j2k/tests/testData/fileOrElement/issues/comments.kt similarity index 100% rename from j2k/tests/testData/ast/issues/comments.kt rename to j2k/tests/testData/fileOrElement/issues/comments.kt diff --git a/j2k/tests/testData/ast/issues/doNotQualifyStatic.java b/j2k/tests/testData/fileOrElement/issues/doNotQualifyStatic.java similarity index 100% rename from j2k/tests/testData/ast/issues/doNotQualifyStatic.java rename to j2k/tests/testData/fileOrElement/issues/doNotQualifyStatic.java diff --git a/j2k/tests/testData/ast/issues/doNotQualifyStatic.kt b/j2k/tests/testData/fileOrElement/issues/doNotQualifyStatic.kt similarity index 100% rename from j2k/tests/testData/ast/issues/doNotQualifyStatic.kt rename to j2k/tests/testData/fileOrElement/issues/doNotQualifyStatic.kt diff --git a/j2k/tests/testData/ast/issues/kt-1016.java b/j2k/tests/testData/fileOrElement/issues/kt-1016.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-1016.java rename to j2k/tests/testData/fileOrElement/issues/kt-1016.java diff --git a/j2k/tests/testData/ast/issues/kt-1016.kt b/j2k/tests/testData/fileOrElement/issues/kt-1016.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-1016.kt rename to j2k/tests/testData/fileOrElement/issues/kt-1016.kt diff --git a/j2k/tests/testData/ast/issues/kt-1048.java b/j2k/tests/testData/fileOrElement/issues/kt-1048.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-1048.java rename to j2k/tests/testData/fileOrElement/issues/kt-1048.java diff --git a/j2k/tests/testData/ast/issues/kt-1048.kt b/j2k/tests/testData/fileOrElement/issues/kt-1048.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-1048.kt rename to j2k/tests/testData/fileOrElement/issues/kt-1048.kt diff --git a/j2k/tests/testData/ast/issues/kt-1074.java b/j2k/tests/testData/fileOrElement/issues/kt-1074.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-1074.java rename to j2k/tests/testData/fileOrElement/issues/kt-1074.java diff --git a/j2k/tests/testData/ast/issues/kt-1074.kt b/j2k/tests/testData/fileOrElement/issues/kt-1074.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-1074.kt rename to j2k/tests/testData/fileOrElement/issues/kt-1074.kt diff --git a/j2k/tests/testData/ast/issues/kt-5294.java b/j2k/tests/testData/fileOrElement/issues/kt-5294.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-5294.java rename to j2k/tests/testData/fileOrElement/issues/kt-5294.java diff --git a/j2k/tests/testData/ast/issues/kt-5294.kt b/j2k/tests/testData/fileOrElement/issues/kt-5294.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-5294.kt rename to j2k/tests/testData/fileOrElement/issues/kt-5294.kt diff --git a/j2k/tests/testData/ast/issues/kt-5400.java b/j2k/tests/testData/fileOrElement/issues/kt-5400.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-5400.java rename to j2k/tests/testData/fileOrElement/issues/kt-5400.java diff --git a/j2k/tests/testData/ast/issues/kt-5400.kt b/j2k/tests/testData/fileOrElement/issues/kt-5400.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-5400.kt rename to j2k/tests/testData/fileOrElement/issues/kt-5400.kt diff --git a/j2k/tests/testData/ast/issues/kt-543-boxed.java b/j2k/tests/testData/fileOrElement/issues/kt-543-boxed.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-543-boxed.java rename to j2k/tests/testData/fileOrElement/issues/kt-543-boxed.java diff --git a/j2k/tests/testData/ast/issues/kt-543-boxed.kt b/j2k/tests/testData/fileOrElement/issues/kt-543-boxed.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-543-boxed.kt rename to j2k/tests/testData/fileOrElement/issues/kt-543-boxed.kt diff --git a/j2k/tests/testData/ast/issues/kt-543-mixed.java b/j2k/tests/testData/fileOrElement/issues/kt-543-mixed.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-543-mixed.java rename to j2k/tests/testData/fileOrElement/issues/kt-543-mixed.java diff --git a/j2k/tests/testData/ast/issues/kt-543-mixed.kt b/j2k/tests/testData/fileOrElement/issues/kt-543-mixed.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-543-mixed.kt rename to j2k/tests/testData/fileOrElement/issues/kt-543-mixed.kt diff --git a/j2k/tests/testData/ast/issues/kt-543.java b/j2k/tests/testData/fileOrElement/issues/kt-543.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-543.java rename to j2k/tests/testData/fileOrElement/issues/kt-543.java diff --git a/j2k/tests/testData/ast/issues/kt-543.kt b/j2k/tests/testData/fileOrElement/issues/kt-543.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-543.kt rename to j2k/tests/testData/fileOrElement/issues/kt-543.kt diff --git a/j2k/tests/testData/ast/issues/kt-638.java b/j2k/tests/testData/fileOrElement/issues/kt-638.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-638.java rename to j2k/tests/testData/fileOrElement/issues/kt-638.java diff --git a/j2k/tests/testData/ast/issues/kt-638.kt b/j2k/tests/testData/fileOrElement/issues/kt-638.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-638.kt rename to j2k/tests/testData/fileOrElement/issues/kt-638.kt diff --git a/j2k/tests/testData/ast/issues/kt-696.java b/j2k/tests/testData/fileOrElement/issues/kt-696.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-696.java rename to j2k/tests/testData/fileOrElement/issues/kt-696.java diff --git a/j2k/tests/testData/ast/issues/kt-696.kt b/j2k/tests/testData/fileOrElement/issues/kt-696.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-696.kt rename to j2k/tests/testData/fileOrElement/issues/kt-696.kt diff --git a/j2k/tests/testData/ast/issues/kt-792-mixed.java b/j2k/tests/testData/fileOrElement/issues/kt-792-mixed.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-792-mixed.java rename to j2k/tests/testData/fileOrElement/issues/kt-792-mixed.java diff --git a/j2k/tests/testData/ast/issues/kt-792-mixed.kt b/j2k/tests/testData/fileOrElement/issues/kt-792-mixed.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-792-mixed.kt rename to j2k/tests/testData/fileOrElement/issues/kt-792-mixed.kt diff --git a/j2k/tests/testData/ast/issues/kt-792.java b/j2k/tests/testData/fileOrElement/issues/kt-792.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-792.java rename to j2k/tests/testData/fileOrElement/issues/kt-792.java diff --git a/j2k/tests/testData/ast/issues/kt-792.kt b/j2k/tests/testData/fileOrElement/issues/kt-792.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-792.kt rename to j2k/tests/testData/fileOrElement/issues/kt-792.kt diff --git a/j2k/tests/testData/ast/issues/kt-794-mixed.java b/j2k/tests/testData/fileOrElement/issues/kt-794-mixed.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-794-mixed.java rename to j2k/tests/testData/fileOrElement/issues/kt-794-mixed.java diff --git a/j2k/tests/testData/ast/issues/kt-794-mixed.kt b/j2k/tests/testData/fileOrElement/issues/kt-794-mixed.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-794-mixed.kt rename to j2k/tests/testData/fileOrElement/issues/kt-794-mixed.kt diff --git a/j2k/tests/testData/ast/issues/kt-794.java b/j2k/tests/testData/fileOrElement/issues/kt-794.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-794.java rename to j2k/tests/testData/fileOrElement/issues/kt-794.java diff --git a/j2k/tests/testData/ast/issues/kt-794.kt b/j2k/tests/testData/fileOrElement/issues/kt-794.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-794.kt rename to j2k/tests/testData/fileOrElement/issues/kt-794.kt diff --git a/j2k/tests/testData/ast/issues/kt-807.java b/j2k/tests/testData/fileOrElement/issues/kt-807.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-807.java rename to j2k/tests/testData/fileOrElement/issues/kt-807.java diff --git a/j2k/tests/testData/ast/issues/kt-807.kt b/j2k/tests/testData/fileOrElement/issues/kt-807.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-807.kt rename to j2k/tests/testData/fileOrElement/issues/kt-807.kt diff --git a/j2k/tests/testData/ast/issues/kt-809-string.java b/j2k/tests/testData/fileOrElement/issues/kt-809-string.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-809-string.java rename to j2k/tests/testData/fileOrElement/issues/kt-809-string.java diff --git a/j2k/tests/testData/ast/issues/kt-809-string.kt b/j2k/tests/testData/fileOrElement/issues/kt-809-string.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-809-string.kt rename to j2k/tests/testData/fileOrElement/issues/kt-809-string.kt diff --git a/j2k/tests/testData/ast/issues/kt-809.java b/j2k/tests/testData/fileOrElement/issues/kt-809.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-809.java rename to j2k/tests/testData/fileOrElement/issues/kt-809.java diff --git a/j2k/tests/testData/ast/issues/kt-809.kt b/j2k/tests/testData/fileOrElement/issues/kt-809.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-809.kt rename to j2k/tests/testData/fileOrElement/issues/kt-809.kt diff --git a/j2k/tests/testData/ast/issues/kt-820-field.java b/j2k/tests/testData/fileOrElement/issues/kt-820-field.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-820-field.java rename to j2k/tests/testData/fileOrElement/issues/kt-820-field.java diff --git a/j2k/tests/testData/ast/issues/kt-820-field.kt b/j2k/tests/testData/fileOrElement/issues/kt-820-field.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-820-field.kt rename to j2k/tests/testData/fileOrElement/issues/kt-820-field.kt diff --git a/j2k/tests/testData/ast/issues/kt-820-string.java b/j2k/tests/testData/fileOrElement/issues/kt-820-string.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-820-string.java rename to j2k/tests/testData/fileOrElement/issues/kt-820-string.java diff --git a/j2k/tests/testData/ast/issues/kt-820-string.kt b/j2k/tests/testData/fileOrElement/issues/kt-820-string.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-820-string.kt rename to j2k/tests/testData/fileOrElement/issues/kt-820-string.kt diff --git a/j2k/tests/testData/ast/issues/kt-820.java b/j2k/tests/testData/fileOrElement/issues/kt-820.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-820.java rename to j2k/tests/testData/fileOrElement/issues/kt-820.java diff --git a/j2k/tests/testData/ast/issues/kt-820.kt b/j2k/tests/testData/fileOrElement/issues/kt-820.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-820.kt rename to j2k/tests/testData/fileOrElement/issues/kt-820.kt diff --git a/j2k/tests/testData/ast/issues/kt-824-isDir.java b/j2k/tests/testData/fileOrElement/issues/kt-824-isDir.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-824-isDir.java rename to j2k/tests/testData/fileOrElement/issues/kt-824-isDir.java diff --git a/j2k/tests/testData/ast/issues/kt-824-isDir.kt b/j2k/tests/testData/fileOrElement/issues/kt-824-isDir.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-824-isDir.kt rename to j2k/tests/testData/fileOrElement/issues/kt-824-isDir.kt diff --git a/j2k/tests/testData/ast/issues/kt-824.java b/j2k/tests/testData/fileOrElement/issues/kt-824.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-824.java rename to j2k/tests/testData/fileOrElement/issues/kt-824.java diff --git a/j2k/tests/testData/ast/issues/kt-824.kt b/j2k/tests/testData/fileOrElement/issues/kt-824.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-824.kt rename to j2k/tests/testData/fileOrElement/issues/kt-824.kt diff --git a/j2k/tests/testData/ast/issues/kt-828.java b/j2k/tests/testData/fileOrElement/issues/kt-828.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-828.java rename to j2k/tests/testData/fileOrElement/issues/kt-828.java diff --git a/j2k/tests/testData/ast/issues/kt-828.kt b/j2k/tests/testData/fileOrElement/issues/kt-828.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-828.kt rename to j2k/tests/testData/fileOrElement/issues/kt-828.kt diff --git a/j2k/tests/testData/ast/issues/kt-836.java b/j2k/tests/testData/fileOrElement/issues/kt-836.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-836.java rename to j2k/tests/testData/fileOrElement/issues/kt-836.java diff --git a/j2k/tests/testData/ast/issues/kt-836.kt b/j2k/tests/testData/fileOrElement/issues/kt-836.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-836.kt rename to j2k/tests/testData/fileOrElement/issues/kt-836.kt diff --git a/j2k/tests/testData/ast/issues/kt-837.java b/j2k/tests/testData/fileOrElement/issues/kt-837.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-837.java rename to j2k/tests/testData/fileOrElement/issues/kt-837.java diff --git a/j2k/tests/testData/ast/issues/kt-837.kt b/j2k/tests/testData/fileOrElement/issues/kt-837.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-837.kt rename to j2k/tests/testData/fileOrElement/issues/kt-837.kt diff --git a/j2k/tests/testData/ast/issues/kt-851.java b/j2k/tests/testData/fileOrElement/issues/kt-851.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-851.java rename to j2k/tests/testData/fileOrElement/issues/kt-851.java diff --git a/j2k/tests/testData/ast/issues/kt-851.kt b/j2k/tests/testData/fileOrElement/issues/kt-851.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-851.kt rename to j2k/tests/testData/fileOrElement/issues/kt-851.kt diff --git a/j2k/tests/testData/ast/issues/kt-852.java b/j2k/tests/testData/fileOrElement/issues/kt-852.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-852.java rename to j2k/tests/testData/fileOrElement/issues/kt-852.java diff --git a/j2k/tests/testData/ast/issues/kt-852.kt b/j2k/tests/testData/fileOrElement/issues/kt-852.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-852.kt rename to j2k/tests/testData/fileOrElement/issues/kt-852.kt diff --git a/j2k/tests/testData/ast/issues/kt-871.java b/j2k/tests/testData/fileOrElement/issues/kt-871.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-871.java rename to j2k/tests/testData/fileOrElement/issues/kt-871.java diff --git a/j2k/tests/testData/ast/issues/kt-871.kt b/j2k/tests/testData/fileOrElement/issues/kt-871.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-871.kt rename to j2k/tests/testData/fileOrElement/issues/kt-871.kt diff --git a/j2k/tests/testData/ast/issues/kt-879.java b/j2k/tests/testData/fileOrElement/issues/kt-879.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-879.java rename to j2k/tests/testData/fileOrElement/issues/kt-879.java diff --git a/j2k/tests/testData/ast/issues/kt-879.kt b/j2k/tests/testData/fileOrElement/issues/kt-879.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-879.kt rename to j2k/tests/testData/fileOrElement/issues/kt-879.kt diff --git a/j2k/tests/testData/ast/issues/kt-893.java b/j2k/tests/testData/fileOrElement/issues/kt-893.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-893.java rename to j2k/tests/testData/fileOrElement/issues/kt-893.java diff --git a/j2k/tests/testData/ast/issues/kt-893.kt b/j2k/tests/testData/fileOrElement/issues/kt-893.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-893.kt rename to j2k/tests/testData/fileOrElement/issues/kt-893.kt diff --git a/j2k/tests/testData/ast/issues/kt-899.java b/j2k/tests/testData/fileOrElement/issues/kt-899.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-899.java rename to j2k/tests/testData/fileOrElement/issues/kt-899.java diff --git a/j2k/tests/testData/ast/issues/kt-899.kt b/j2k/tests/testData/fileOrElement/issues/kt-899.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-899.kt rename to j2k/tests/testData/fileOrElement/issues/kt-899.kt diff --git a/j2k/tests/testData/ast/issues/kt-963.java b/j2k/tests/testData/fileOrElement/issues/kt-963.java similarity index 100% rename from j2k/tests/testData/ast/issues/kt-963.java rename to j2k/tests/testData/fileOrElement/issues/kt-963.java diff --git a/j2k/tests/testData/ast/issues/kt-963.kt b/j2k/tests/testData/fileOrElement/issues/kt-963.kt similarity index 100% rename from j2k/tests/testData/ast/issues/kt-963.kt rename to j2k/tests/testData/fileOrElement/issues/kt-963.kt diff --git a/j2k/tests/testData/ast/issues/qualifyStatic.java b/j2k/tests/testData/fileOrElement/issues/qualifyStatic.java similarity index 100% rename from j2k/tests/testData/ast/issues/qualifyStatic.java rename to j2k/tests/testData/fileOrElement/issues/qualifyStatic.java diff --git a/j2k/tests/testData/ast/issues/qualifyStatic.kt b/j2k/tests/testData/fileOrElement/issues/qualifyStatic.kt similarity index 100% rename from j2k/tests/testData/ast/issues/qualifyStatic.kt rename to j2k/tests/testData/fileOrElement/issues/qualifyStatic.kt diff --git a/j2k/tests/testData/ast/issues/spaceBeforeAssignment.java b/j2k/tests/testData/fileOrElement/issues/spaceBeforeAssignment.java similarity index 100% rename from j2k/tests/testData/ast/issues/spaceBeforeAssignment.java rename to j2k/tests/testData/fileOrElement/issues/spaceBeforeAssignment.java diff --git a/j2k/tests/testData/ast/issues/spaceBeforeAssignment.kt b/j2k/tests/testData/fileOrElement/issues/spaceBeforeAssignment.kt similarity index 100% rename from j2k/tests/testData/ast/issues/spaceBeforeAssignment.kt rename to j2k/tests/testData/fileOrElement/issues/spaceBeforeAssignment.kt diff --git a/j2k/tests/testData/ast/kotlinApiAccess/ClassObjectMembers.java b/j2k/tests/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.java similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/ClassObjectMembers.java rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.java diff --git a/j2k/tests/testData/ast/kotlinApiAccess/ClassObjectMembers.kt b/j2k/tests/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.kt similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/ClassObjectMembers.kt rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.kt diff --git a/j2k/tests/testData/ast/kotlinApiAccess/CorrectFunNullabilityDetected.java b/j2k/tests/testData/fileOrElement/kotlinApiAccess/CorrectFunNullabilityDetected.java similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/CorrectFunNullabilityDetected.java rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/CorrectFunNullabilityDetected.java diff --git a/j2k/tests/testData/ast/kotlinApiAccess/CorrectFunNullabilityDetected.kt b/j2k/tests/testData/fileOrElement/kotlinApiAccess/CorrectFunNullabilityDetected.kt similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/CorrectFunNullabilityDetected.kt rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/CorrectFunNullabilityDetected.kt diff --git a/j2k/tests/testData/ast/kotlinApiAccess/CorrectNullabilityDetected.java b/j2k/tests/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.java similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/CorrectNullabilityDetected.java rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.java diff --git a/j2k/tests/testData/ast/kotlinApiAccess/CorrectNullabilityDetected.kt b/j2k/tests/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.kt similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/CorrectNullabilityDetected.kt rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.kt diff --git a/j2k/tests/testData/ast/kotlinApiAccess/ExtensionFunction.java b/j2k/tests/testData/fileOrElement/kotlinApiAccess/ExtensionFunction.java similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/ExtensionFunction.java rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/ExtensionFunction.java diff --git a/j2k/tests/testData/ast/kotlinApiAccess/ExtensionFunction.kt b/j2k/tests/testData/fileOrElement/kotlinApiAccess/ExtensionFunction.kt similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/ExtensionFunction.kt rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/ExtensionFunction.kt diff --git a/j2k/tests/testData/ast/kotlinApiAccess/ExtensionProperty.java b/j2k/tests/testData/fileOrElement/kotlinApiAccess/ExtensionProperty.java similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/ExtensionProperty.java rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/ExtensionProperty.java diff --git a/j2k/tests/testData/ast/kotlinApiAccess/ExtensionProperty.kt b/j2k/tests/testData/fileOrElement/kotlinApiAccess/ExtensionProperty.kt similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/ExtensionProperty.kt rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/ExtensionProperty.kt diff --git a/j2k/tests/testData/ast/kotlinApiAccess/GlobalFunction.java b/j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalFunction.java similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/GlobalFunction.java rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalFunction.java diff --git a/j2k/tests/testData/ast/kotlinApiAccess/GlobalFunction.kt b/j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalFunction.kt similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/GlobalFunction.kt rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalFunction.kt diff --git a/j2k/tests/testData/ast/kotlinApiAccess/GlobalGenericFunction.java b/j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalGenericFunction.java similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/GlobalGenericFunction.java rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalGenericFunction.java diff --git a/j2k/tests/testData/ast/kotlinApiAccess/GlobalGenericFunction.kt b/j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalGenericFunction.kt similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/GlobalGenericFunction.kt rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalGenericFunction.kt diff --git a/j2k/tests/testData/ast/kotlinApiAccess/GlobalValue1.java b/j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalValue1.java similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/GlobalValue1.java rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalValue1.java diff --git a/j2k/tests/testData/ast/kotlinApiAccess/GlobalValue1.kt b/j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalValue1.kt similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/GlobalValue1.kt rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalValue1.kt diff --git a/j2k/tests/testData/ast/kotlinApiAccess/GlobalValue2.java b/j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalValue2.java similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/GlobalValue2.java rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalValue2.java diff --git a/j2k/tests/testData/ast/kotlinApiAccess/GlobalValue2.kt b/j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalValue2.kt similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/GlobalValue2.kt rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/GlobalValue2.kt diff --git a/j2k/tests/testData/ast/kotlinApiAccess/InheritedProperty.java b/j2k/tests/testData/fileOrElement/kotlinApiAccess/InheritedProperty.java similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/InheritedProperty.java rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/InheritedProperty.java diff --git a/j2k/tests/testData/ast/kotlinApiAccess/InheritedProperty.kt b/j2k/tests/testData/fileOrElement/kotlinApiAccess/InheritedProperty.kt similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/InheritedProperty.kt rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/InheritedProperty.kt diff --git a/j2k/tests/testData/ast/kotlinApiAccess/ObjectMembers.java b/j2k/tests/testData/fileOrElement/kotlinApiAccess/ObjectMembers.java similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/ObjectMembers.java rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/ObjectMembers.java diff --git a/j2k/tests/testData/ast/kotlinApiAccess/ObjectMembers.kt b/j2k/tests/testData/fileOrElement/kotlinApiAccess/ObjectMembers.kt similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/ObjectMembers.kt rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/ObjectMembers.kt diff --git a/j2k/tests/testData/ast/kotlinApiAccess/Property.java b/j2k/tests/testData/fileOrElement/kotlinApiAccess/Property.java similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/Property.java rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/Property.java diff --git a/j2k/tests/testData/ast/kotlinApiAccess/Property.kt b/j2k/tests/testData/fileOrElement/kotlinApiAccess/Property.kt similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/Property.kt rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/Property.kt diff --git a/j2k/tests/testData/ast/kotlinApiAccess/Property2.java b/j2k/tests/testData/fileOrElement/kotlinApiAccess/Property2.java similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/Property2.java rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/Property2.java diff --git a/j2k/tests/testData/ast/kotlinApiAccess/Property2.kt b/j2k/tests/testData/fileOrElement/kotlinApiAccess/Property2.kt similarity index 100% rename from j2k/tests/testData/ast/kotlinApiAccess/Property2.kt rename to j2k/tests/testData/fileOrElement/kotlinApiAccess/Property2.kt diff --git a/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.java b/j2k/tests/testData/fileOrElement/labelStatement/complicatedExampleFromJavaTutorial.java similarity index 100% rename from j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.java rename to j2k/tests/testData/fileOrElement/labelStatement/complicatedExampleFromJavaTutorial.java diff --git a/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.kt b/j2k/tests/testData/fileOrElement/labelStatement/complicatedExampleFromJavaTutorial.kt similarity index 100% rename from j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.kt rename to j2k/tests/testData/fileOrElement/labelStatement/complicatedExampleFromJavaTutorial.kt diff --git a/j2k/tests/testData/ast/list/ForEach.java b/j2k/tests/testData/fileOrElement/list/ForEach.java similarity index 100% rename from j2k/tests/testData/ast/list/ForEach.java rename to j2k/tests/testData/fileOrElement/list/ForEach.java diff --git a/j2k/tests/testData/ast/list/ForEach.kt b/j2k/tests/testData/fileOrElement/list/ForEach.kt similarity index 100% rename from j2k/tests/testData/ast/list/ForEach.kt rename to j2k/tests/testData/fileOrElement/list/ForEach.kt diff --git a/j2k/tests/testData/ast/list/Lists.java b/j2k/tests/testData/fileOrElement/list/Lists.java similarity index 100% rename from j2k/tests/testData/ast/list/Lists.java rename to j2k/tests/testData/fileOrElement/list/Lists.java diff --git a/j2k/tests/testData/ast/list/Lists.kt b/j2k/tests/testData/fileOrElement/list/Lists.kt similarity index 100% rename from j2k/tests/testData/ast/list/Lists.kt rename to j2k/tests/testData/fileOrElement/list/Lists.kt diff --git a/j2k/tests/testData/ast/literalExpression/char.java b/j2k/tests/testData/fileOrElement/literalExpression/char.java similarity index 100% rename from j2k/tests/testData/ast/literalExpression/char.java rename to j2k/tests/testData/fileOrElement/literalExpression/char.java diff --git a/j2k/tests/testData/ast/literalExpression/char.kt b/j2k/tests/testData/fileOrElement/literalExpression/char.kt similarity index 100% rename from j2k/tests/testData/ast/literalExpression/char.kt rename to j2k/tests/testData/fileOrElement/literalExpression/char.kt diff --git a/j2k/tests/testData/ast/literalExpression/dollarInsideString.java b/j2k/tests/testData/fileOrElement/literalExpression/dollarInsideString.java similarity index 100% rename from j2k/tests/testData/ast/literalExpression/dollarInsideString.java rename to j2k/tests/testData/fileOrElement/literalExpression/dollarInsideString.java diff --git a/j2k/tests/testData/ast/literalExpression/dollarInsideString.kt b/j2k/tests/testData/fileOrElement/literalExpression/dollarInsideString.kt similarity index 100% rename from j2k/tests/testData/ast/literalExpression/dollarInsideString.kt rename to j2k/tests/testData/fileOrElement/literalExpression/dollarInsideString.kt diff --git a/j2k/tests/testData/ast/literalExpression/endsWithDFL.java b/j2k/tests/testData/fileOrElement/literalExpression/endsWithDFL.java similarity index 100% rename from j2k/tests/testData/ast/literalExpression/endsWithDFL.java rename to j2k/tests/testData/fileOrElement/literalExpression/endsWithDFL.java diff --git a/j2k/tests/testData/ast/literalExpression/endsWithDFL.kt b/j2k/tests/testData/fileOrElement/literalExpression/endsWithDFL.kt similarity index 100% rename from j2k/tests/testData/ast/literalExpression/endsWithDFL.kt rename to j2k/tests/testData/fileOrElement/literalExpression/endsWithDFL.kt diff --git a/j2k/tests/testData/ast/literalExpression/hex.java b/j2k/tests/testData/fileOrElement/literalExpression/hex.java similarity index 100% rename from j2k/tests/testData/ast/literalExpression/hex.java rename to j2k/tests/testData/fileOrElement/literalExpression/hex.java diff --git a/j2k/tests/testData/ast/literalExpression/hex.kt b/j2k/tests/testData/fileOrElement/literalExpression/hex.kt similarity index 100% rename from j2k/tests/testData/ast/literalExpression/hex.kt rename to j2k/tests/testData/fileOrElement/literalExpression/hex.kt diff --git a/j2k/tests/testData/ast/literalExpression/octal.java b/j2k/tests/testData/fileOrElement/literalExpression/octal.java similarity index 100% rename from j2k/tests/testData/ast/literalExpression/octal.java rename to j2k/tests/testData/fileOrElement/literalExpression/octal.java diff --git a/j2k/tests/testData/ast/literalExpression/octal.kt b/j2k/tests/testData/fileOrElement/literalExpression/octal.kt similarity index 100% rename from j2k/tests/testData/ast/literalExpression/octal.kt rename to j2k/tests/testData/fileOrElement/literalExpression/octal.kt diff --git a/j2k/tests/testData/ast/literalExpression/trueOrFalse.java b/j2k/tests/testData/fileOrElement/literalExpression/trueOrFalse.java similarity index 100% rename from j2k/tests/testData/ast/literalExpression/trueOrFalse.java rename to j2k/tests/testData/fileOrElement/literalExpression/trueOrFalse.java diff --git a/j2k/tests/testData/ast/literalExpression/trueOrFalse.kt b/j2k/tests/testData/fileOrElement/literalExpression/trueOrFalse.kt similarity index 100% rename from j2k/tests/testData/ast/literalExpression/trueOrFalse.kt rename to j2k/tests/testData/fileOrElement/literalExpression/trueOrFalse.kt diff --git a/j2k/tests/testData/ast/localVariable/autoBangBang.java b/j2k/tests/testData/fileOrElement/localVariable/autoBangBang.java similarity index 100% rename from j2k/tests/testData/ast/localVariable/autoBangBang.java rename to j2k/tests/testData/fileOrElement/localVariable/autoBangBang.java diff --git a/j2k/tests/testData/ast/localVariable/autoBangBang.kt b/j2k/tests/testData/fileOrElement/localVariable/autoBangBang.kt similarity index 100% rename from j2k/tests/testData/ast/localVariable/autoBangBang.kt rename to j2k/tests/testData/fileOrElement/localVariable/autoBangBang.kt diff --git a/j2k/tests/testData/ast/localVariable/conversion.java b/j2k/tests/testData/fileOrElement/localVariable/conversion.java similarity index 100% rename from j2k/tests/testData/ast/localVariable/conversion.java rename to j2k/tests/testData/fileOrElement/localVariable/conversion.java diff --git a/j2k/tests/testData/ast/localVariable/conversion.kt b/j2k/tests/testData/fileOrElement/localVariable/conversion.kt similarity index 100% rename from j2k/tests/testData/ast/localVariable/conversion.kt rename to j2k/tests/testData/fileOrElement/localVariable/conversion.kt diff --git a/j2k/tests/testData/ast/localVariable/literalConversion.java b/j2k/tests/testData/fileOrElement/localVariable/literalConversion.java similarity index 100% rename from j2k/tests/testData/ast/localVariable/literalConversion.java rename to j2k/tests/testData/fileOrElement/localVariable/literalConversion.java diff --git a/j2k/tests/testData/ast/localVariable/literalConversion.kt b/j2k/tests/testData/fileOrElement/localVariable/literalConversion.kt similarity index 100% rename from j2k/tests/testData/ast/localVariable/literalConversion.kt rename to j2k/tests/testData/fileOrElement/localVariable/literalConversion.kt diff --git a/j2k/tests/testData/ast/localVariable/nullIInitializer.java b/j2k/tests/testData/fileOrElement/localVariable/nullIInitializer.java similarity index 100% rename from j2k/tests/testData/ast/localVariable/nullIInitializer.java rename to j2k/tests/testData/fileOrElement/localVariable/nullIInitializer.java diff --git a/j2k/tests/testData/ast/localVariable/nullIInitializer.kt b/j2k/tests/testData/fileOrElement/localVariable/nullIInitializer.kt similarity index 100% rename from j2k/tests/testData/ast/localVariable/nullIInitializer.kt rename to j2k/tests/testData/fileOrElement/localVariable/nullIInitializer.kt diff --git a/j2k/tests/testData/ast/localVariable/object.java b/j2k/tests/testData/fileOrElement/localVariable/object.java similarity index 100% rename from j2k/tests/testData/ast/localVariable/object.java rename to j2k/tests/testData/fileOrElement/localVariable/object.java diff --git a/j2k/tests/testData/ast/localVariable/object.kt b/j2k/tests/testData/fileOrElement/localVariable/object.kt similarity index 100% rename from j2k/tests/testData/ast/localVariable/object.kt rename to j2k/tests/testData/fileOrElement/localVariable/object.kt diff --git a/j2k/tests/testData/ast/localVariable/unboxing.java b/j2k/tests/testData/fileOrElement/localVariable/unboxing.java similarity index 100% rename from j2k/tests/testData/ast/localVariable/unboxing.java rename to j2k/tests/testData/fileOrElement/localVariable/unboxing.java diff --git a/j2k/tests/testData/ast/localVariable/unboxing.kt b/j2k/tests/testData/fileOrElement/localVariable/unboxing.kt similarity index 100% rename from j2k/tests/testData/ast/localVariable/unboxing.kt rename to j2k/tests/testData/fileOrElement/localVariable/unboxing.kt diff --git a/j2k/tests/testData/ast/localVariable/valTypeDoNotMatch.java b/j2k/tests/testData/fileOrElement/localVariable/valTypeDoNotMatch.java similarity index 100% rename from j2k/tests/testData/ast/localVariable/valTypeDoNotMatch.java rename to j2k/tests/testData/fileOrElement/localVariable/valTypeDoNotMatch.java diff --git a/j2k/tests/testData/ast/localVariable/valTypeDoNotMatch.kt b/j2k/tests/testData/fileOrElement/localVariable/valTypeDoNotMatch.kt similarity index 100% rename from j2k/tests/testData/ast/localVariable/valTypeDoNotMatch.kt rename to j2k/tests/testData/fileOrElement/localVariable/valTypeDoNotMatch.kt diff --git a/j2k/tests/testData/ast/localVariable/varTypeDoNotMatch.java b/j2k/tests/testData/fileOrElement/localVariable/varTypeDoNotMatch.java similarity index 100% rename from j2k/tests/testData/ast/localVariable/varTypeDoNotMatch.java rename to j2k/tests/testData/fileOrElement/localVariable/varTypeDoNotMatch.java diff --git a/j2k/tests/testData/ast/localVariable/varTypeDoNotMatch.kt b/j2k/tests/testData/fileOrElement/localVariable/varTypeDoNotMatch.kt similarity index 100% rename from j2k/tests/testData/ast/localVariable/varTypeDoNotMatch.kt rename to j2k/tests/testData/fileOrElement/localVariable/varTypeDoNotMatch.kt diff --git a/j2k/tests/testData/ast/localVariable/varWithNoInitializer.java b/j2k/tests/testData/fileOrElement/localVariable/varWithNoInitializer.java similarity index 100% rename from j2k/tests/testData/ast/localVariable/varWithNoInitializer.java rename to j2k/tests/testData/fileOrElement/localVariable/varWithNoInitializer.java diff --git a/j2k/tests/testData/ast/localVariable/varWithNoInitializer.kt b/j2k/tests/testData/fileOrElement/localVariable/varWithNoInitializer.kt similarity index 100% rename from j2k/tests/testData/ast/localVariable/varWithNoInitializer.kt rename to j2k/tests/testData/fileOrElement/localVariable/varWithNoInitializer.kt diff --git a/j2k/tests/testData/ast/methodCallExpression/callWithKeywords.java b/j2k/tests/testData/fileOrElement/methodCallExpression/callWithKeywords.java similarity index 100% rename from j2k/tests/testData/ast/methodCallExpression/callWithKeywords.java rename to j2k/tests/testData/fileOrElement/methodCallExpression/callWithKeywords.java diff --git a/j2k/tests/testData/ast/methodCallExpression/callWithKeywords.kt b/j2k/tests/testData/fileOrElement/methodCallExpression/callWithKeywords.kt similarity index 100% rename from j2k/tests/testData/ast/methodCallExpression/callWithKeywords.kt rename to j2k/tests/testData/fileOrElement/methodCallExpression/callWithKeywords.kt diff --git a/j2k/tests/testData/ast/methodCallExpression/collectionsMethods.java b/j2k/tests/testData/fileOrElement/methodCallExpression/collectionsMethods.java similarity index 100% rename from j2k/tests/testData/ast/methodCallExpression/collectionsMethods.java rename to j2k/tests/testData/fileOrElement/methodCallExpression/collectionsMethods.java diff --git a/j2k/tests/testData/ast/methodCallExpression/collectionsMethods.kt b/j2k/tests/testData/fileOrElement/methodCallExpression/collectionsMethods.kt similarity index 100% rename from j2k/tests/testData/ast/methodCallExpression/collectionsMethods.kt rename to j2k/tests/testData/fileOrElement/methodCallExpression/collectionsMethods.kt diff --git a/j2k/tests/testData/ast/methodCallExpression/collectionsMethods.kt.todo b/j2k/tests/testData/fileOrElement/methodCallExpression/collectionsMethods.kt.todo similarity index 100% rename from j2k/tests/testData/ast/methodCallExpression/collectionsMethods.kt.todo rename to j2k/tests/testData/fileOrElement/methodCallExpression/collectionsMethods.kt.todo diff --git a/j2k/tests/testData/ast/methodCallExpression/collectionsMethods2.java b/j2k/tests/testData/fileOrElement/methodCallExpression/collectionsMethods2.java similarity index 100% rename from j2k/tests/testData/ast/methodCallExpression/collectionsMethods2.java rename to j2k/tests/testData/fileOrElement/methodCallExpression/collectionsMethods2.java diff --git a/j2k/tests/testData/ast/methodCallExpression/collectionsMethods2.kt b/j2k/tests/testData/fileOrElement/methodCallExpression/collectionsMethods2.kt similarity index 100% rename from j2k/tests/testData/ast/methodCallExpression/collectionsMethods2.kt rename to j2k/tests/testData/fileOrElement/methodCallExpression/collectionsMethods2.kt diff --git a/j2k/tests/testData/ast/methodCallExpression/emptyCall.java b/j2k/tests/testData/fileOrElement/methodCallExpression/emptyCall.java similarity index 100% rename from j2k/tests/testData/ast/methodCallExpression/emptyCall.java rename to j2k/tests/testData/fileOrElement/methodCallExpression/emptyCall.java diff --git a/j2k/tests/testData/ast/methodCallExpression/emptyCall.kt b/j2k/tests/testData/fileOrElement/methodCallExpression/emptyCall.kt similarity index 100% rename from j2k/tests/testData/ast/methodCallExpression/emptyCall.kt rename to j2k/tests/testData/fileOrElement/methodCallExpression/emptyCall.kt diff --git a/j2k/tests/testData/ast/methodCallExpression/genericMethod.java b/j2k/tests/testData/fileOrElement/methodCallExpression/genericMethod.java similarity index 100% rename from j2k/tests/testData/ast/methodCallExpression/genericMethod.java rename to j2k/tests/testData/fileOrElement/methodCallExpression/genericMethod.java diff --git a/j2k/tests/testData/ast/methodCallExpression/genericMethod.kt b/j2k/tests/testData/fileOrElement/methodCallExpression/genericMethod.kt similarity index 100% rename from j2k/tests/testData/ast/methodCallExpression/genericMethod.kt rename to j2k/tests/testData/fileOrElement/methodCallExpression/genericMethod.kt diff --git a/j2k/tests/testData/ast/methodCallExpression/getClass.java b/j2k/tests/testData/fileOrElement/methodCallExpression/getClass.java similarity index 100% rename from j2k/tests/testData/ast/methodCallExpression/getClass.java rename to j2k/tests/testData/fileOrElement/methodCallExpression/getClass.java diff --git a/j2k/tests/testData/ast/methodCallExpression/getClass.kt b/j2k/tests/testData/fileOrElement/methodCallExpression/getClass.kt similarity index 100% rename from j2k/tests/testData/ast/methodCallExpression/getClass.kt rename to j2k/tests/testData/fileOrElement/methodCallExpression/getClass.kt diff --git a/j2k/tests/testData/ast/methodCallExpression/simpleCall.java b/j2k/tests/testData/fileOrElement/methodCallExpression/simpleCall.java similarity index 100% rename from j2k/tests/testData/ast/methodCallExpression/simpleCall.java rename to j2k/tests/testData/fileOrElement/methodCallExpression/simpleCall.java diff --git a/j2k/tests/testData/ast/methodCallExpression/simpleCall.kt b/j2k/tests/testData/fileOrElement/methodCallExpression/simpleCall.kt similarity index 100% rename from j2k/tests/testData/ast/methodCallExpression/simpleCall.kt rename to j2k/tests/testData/fileOrElement/methodCallExpression/simpleCall.kt diff --git a/j2k/tests/testData/ast/methodCallExpression/vararg1.java b/j2k/tests/testData/fileOrElement/methodCallExpression/vararg1.java similarity index 100% rename from j2k/tests/testData/ast/methodCallExpression/vararg1.java rename to j2k/tests/testData/fileOrElement/methodCallExpression/vararg1.java diff --git a/j2k/tests/testData/ast/methodCallExpression/vararg1.kt b/j2k/tests/testData/fileOrElement/methodCallExpression/vararg1.kt similarity index 100% rename from j2k/tests/testData/ast/methodCallExpression/vararg1.kt rename to j2k/tests/testData/fileOrElement/methodCallExpression/vararg1.kt diff --git a/j2k/tests/testData/ast/methodCallExpression/vararg2.java b/j2k/tests/testData/fileOrElement/methodCallExpression/vararg2.java similarity index 100% rename from j2k/tests/testData/ast/methodCallExpression/vararg2.java rename to j2k/tests/testData/fileOrElement/methodCallExpression/vararg2.java diff --git a/j2k/tests/testData/ast/methodCallExpression/vararg2.kt b/j2k/tests/testData/fileOrElement/methodCallExpression/vararg2.kt similarity index 100% rename from j2k/tests/testData/ast/methodCallExpression/vararg2.kt rename to j2k/tests/testData/fileOrElement/methodCallExpression/vararg2.kt diff --git a/j2k/tests/testData/ast/misc/packageWithClass.java b/j2k/tests/testData/fileOrElement/misc/packageWithClass.java similarity index 100% rename from j2k/tests/testData/ast/misc/packageWithClass.java rename to j2k/tests/testData/fileOrElement/misc/packageWithClass.java diff --git a/j2k/tests/testData/ast/misc/packageWithClass.kt b/j2k/tests/testData/fileOrElement/misc/packageWithClass.kt similarity index 100% rename from j2k/tests/testData/ast/misc/packageWithClass.kt rename to j2k/tests/testData/fileOrElement/misc/packageWithClass.kt diff --git a/j2k/tests/testData/ast/misc/packageWithClasses.java b/j2k/tests/testData/fileOrElement/misc/packageWithClasses.java similarity index 100% rename from j2k/tests/testData/ast/misc/packageWithClasses.java rename to j2k/tests/testData/fileOrElement/misc/packageWithClasses.java diff --git a/j2k/tests/testData/ast/misc/packageWithClasses.kt b/j2k/tests/testData/fileOrElement/misc/packageWithClasses.kt similarity index 100% rename from j2k/tests/testData/ast/misc/packageWithClasses.kt rename to j2k/tests/testData/fileOrElement/misc/packageWithClasses.kt diff --git a/j2k/tests/testData/ast/misc/packageWithImports.java b/j2k/tests/testData/fileOrElement/misc/packageWithImports.java similarity index 100% rename from j2k/tests/testData/ast/misc/packageWithImports.java rename to j2k/tests/testData/fileOrElement/misc/packageWithImports.java diff --git a/j2k/tests/testData/ast/misc/packageWithImports.kt b/j2k/tests/testData/fileOrElement/misc/packageWithImports.kt similarity index 100% rename from j2k/tests/testData/ast/misc/packageWithImports.kt rename to j2k/tests/testData/fileOrElement/misc/packageWithImports.kt diff --git a/j2k/tests/testData/ast/misc/packageWithMixedImports.java b/j2k/tests/testData/fileOrElement/misc/packageWithMixedImports.java similarity index 100% rename from j2k/tests/testData/ast/misc/packageWithMixedImports.java rename to j2k/tests/testData/fileOrElement/misc/packageWithMixedImports.java diff --git a/j2k/tests/testData/ast/misc/packageWithMixedImports.kt b/j2k/tests/testData/fileOrElement/misc/packageWithMixedImports.kt similarity index 100% rename from j2k/tests/testData/ast/misc/packageWithMixedImports.kt rename to j2k/tests/testData/fileOrElement/misc/packageWithMixedImports.kt diff --git a/j2k/tests/testData/ast/misc/packageWithOpenClass.java b/j2k/tests/testData/fileOrElement/misc/packageWithOpenClass.java similarity index 100% rename from j2k/tests/testData/ast/misc/packageWithOpenClass.java rename to j2k/tests/testData/fileOrElement/misc/packageWithOpenClass.java diff --git a/j2k/tests/testData/ast/misc/packageWithOpenClass.kt b/j2k/tests/testData/fileOrElement/misc/packageWithOpenClass.kt similarity index 100% rename from j2k/tests/testData/ast/misc/packageWithOpenClass.kt rename to j2k/tests/testData/fileOrElement/misc/packageWithOpenClass.kt diff --git a/j2k/tests/testData/ast/misc/packageWithStaticImports.java b/j2k/tests/testData/fileOrElement/misc/packageWithStaticImports.java similarity index 100% rename from j2k/tests/testData/ast/misc/packageWithStaticImports.java rename to j2k/tests/testData/fileOrElement/misc/packageWithStaticImports.java diff --git a/j2k/tests/testData/ast/misc/packageWithStaticImports.kt b/j2k/tests/testData/fileOrElement/misc/packageWithStaticImports.kt similarity index 100% rename from j2k/tests/testData/ast/misc/packageWithStaticImports.kt rename to j2k/tests/testData/fileOrElement/misc/packageWithStaticImports.kt diff --git a/j2k/tests/testData/ast/newClassExpression/classWithParam.java b/j2k/tests/testData/fileOrElement/newClassExpression/classWithParam.java similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/classWithParam.java rename to j2k/tests/testData/fileOrElement/newClassExpression/classWithParam.java diff --git a/j2k/tests/testData/ast/newClassExpression/classWithParam.kt b/j2k/tests/testData/fileOrElement/newClassExpression/classWithParam.kt similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/classWithParam.kt rename to j2k/tests/testData/fileOrElement/newClassExpression/classWithParam.kt diff --git a/j2k/tests/testData/ast/newClassExpression/classWithParams.java b/j2k/tests/testData/fileOrElement/newClassExpression/classWithParams.java similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/classWithParams.java rename to j2k/tests/testData/fileOrElement/newClassExpression/classWithParams.java diff --git a/j2k/tests/testData/ast/newClassExpression/classWithParams.kt b/j2k/tests/testData/fileOrElement/newClassExpression/classWithParams.kt similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/classWithParams.kt rename to j2k/tests/testData/fileOrElement/newClassExpression/classWithParams.kt diff --git a/j2k/tests/testData/ast/newClassExpression/classWithoutBody.java b/j2k/tests/testData/fileOrElement/newClassExpression/classWithoutBody.java similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/classWithoutBody.java rename to j2k/tests/testData/fileOrElement/newClassExpression/classWithoutBody.java diff --git a/j2k/tests/testData/ast/newClassExpression/classWithoutBody.kt b/j2k/tests/testData/fileOrElement/newClassExpression/classWithoutBody.kt similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/classWithoutBody.kt rename to j2k/tests/testData/fileOrElement/newClassExpression/classWithoutBody.kt diff --git a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.java b/j2k/tests/testData/fileOrElement/newClassExpression/fullQualifiedName.java similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/fullQualifiedName.java rename to j2k/tests/testData/fileOrElement/newClassExpression/fullQualifiedName.java diff --git a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.kt b/j2k/tests/testData/fileOrElement/newClassExpression/fullQualifiedName.kt similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/fullQualifiedName.kt rename to j2k/tests/testData/fileOrElement/newClassExpression/fullQualifiedName.kt diff --git a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.java b/j2k/tests/testData/fileOrElement/newClassExpression/fullQualifiedName2.java similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.java rename to j2k/tests/testData/fileOrElement/newClassExpression/fullQualifiedName2.java diff --git a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.kt b/j2k/tests/testData/fileOrElement/newClassExpression/fullQualifiedName2.kt similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.kt rename to j2k/tests/testData/fileOrElement/newClassExpression/fullQualifiedName2.kt diff --git a/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.java b/j2k/tests/testData/fileOrElement/newClassExpression/genericClassInvocation.java similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/genericClassInvocation.java rename to j2k/tests/testData/fileOrElement/newClassExpression/genericClassInvocation.java diff --git a/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.kt b/j2k/tests/testData/fileOrElement/newClassExpression/genericClassInvocation.kt similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/genericClassInvocation.kt rename to j2k/tests/testData/fileOrElement/newClassExpression/genericClassInvocation.kt diff --git a/j2k/tests/testData/ast/newClassExpression/newAnonymousClass.java b/j2k/tests/testData/fileOrElement/newClassExpression/newAnonymousClass.java similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/newAnonymousClass.java rename to j2k/tests/testData/fileOrElement/newClassExpression/newAnonymousClass.java diff --git a/j2k/tests/testData/ast/newClassExpression/newAnonymousClass.kt b/j2k/tests/testData/fileOrElement/newClassExpression/newAnonymousClass.kt similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/newAnonymousClass.kt rename to j2k/tests/testData/fileOrElement/newClassExpression/newAnonymousClass.kt diff --git a/j2k/tests/testData/ast/newClassExpression/newAnonymousClass2.java b/j2k/tests/testData/fileOrElement/newClassExpression/newAnonymousClass2.java similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/newAnonymousClass2.java rename to j2k/tests/testData/fileOrElement/newClassExpression/newAnonymousClass2.java diff --git a/j2k/tests/testData/ast/newClassExpression/newAnonymousClass2.kt b/j2k/tests/testData/fileOrElement/newClassExpression/newAnonymousClass2.kt similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/newAnonymousClass2.kt rename to j2k/tests/testData/fileOrElement/newClassExpression/newAnonymousClass2.kt diff --git a/j2k/tests/testData/ast/newClassExpression/newAnonymousClass3.java b/j2k/tests/testData/fileOrElement/newClassExpression/newAnonymousClass3.java similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/newAnonymousClass3.java rename to j2k/tests/testData/fileOrElement/newClassExpression/newAnonymousClass3.java diff --git a/j2k/tests/testData/ast/newClassExpression/newAnonymousClass3.kt b/j2k/tests/testData/fileOrElement/newClassExpression/newAnonymousClass3.kt similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/newAnonymousClass3.kt rename to j2k/tests/testData/fileOrElement/newClassExpression/newAnonymousClass3.kt diff --git a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.java b/j2k/tests/testData/fileOrElement/newClassExpression/newClassByFullName.java similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/newClassByFullName.java rename to j2k/tests/testData/fileOrElement/newClassExpression/newClassByFullName.java diff --git a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt b/j2k/tests/testData/fileOrElement/newClassExpression/newClassByFullName.kt similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt rename to j2k/tests/testData/fileOrElement/newClassExpression/newClassByFullName.kt diff --git a/j2k/tests/testData/ast/newClassExpression/newInnerClass.java b/j2k/tests/testData/fileOrElement/newClassExpression/newInnerClass.java similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/newInnerClass.java rename to j2k/tests/testData/fileOrElement/newClassExpression/newInnerClass.java diff --git a/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt b/j2k/tests/testData/fileOrElement/newClassExpression/newInnerClass.kt similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/newInnerClass.kt rename to j2k/tests/testData/fileOrElement/newClassExpression/newInnerClass.kt diff --git a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.java b/j2k/tests/testData/fileOrElement/newClassExpression/newListAndNewMember.java similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/newListAndNewMember.java rename to j2k/tests/testData/fileOrElement/newClassExpression/newListAndNewMember.java diff --git a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt b/j2k/tests/testData/fileOrElement/newClassExpression/newListAndNewMember.kt similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt rename to j2k/tests/testData/fileOrElement/newClassExpression/newListAndNewMember.kt diff --git a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.java b/j2k/tests/testData/fileOrElement/newClassExpression/newStaticInnerClass.java similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.java rename to j2k/tests/testData/fileOrElement/newClassExpression/newStaticInnerClass.java diff --git a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt b/j2k/tests/testData/fileOrElement/newClassExpression/newStaticInnerClass.kt similarity index 100% rename from j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt rename to j2k/tests/testData/fileOrElement/newClassExpression/newStaticInnerClass.kt diff --git a/j2k/tests/testData/ast/nullability/FieldAssignedWithNull.java b/j2k/tests/testData/fileOrElement/nullability/FieldAssignedWithNull.java similarity index 100% rename from j2k/tests/testData/ast/nullability/FieldAssignedWithNull.java rename to j2k/tests/testData/fileOrElement/nullability/FieldAssignedWithNull.java diff --git a/j2k/tests/testData/ast/nullability/FieldAssignedWithNull.kt b/j2k/tests/testData/fileOrElement/nullability/FieldAssignedWithNull.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/FieldAssignedWithNull.kt rename to j2k/tests/testData/fileOrElement/nullability/FieldAssignedWithNull.kt diff --git a/j2k/tests/testData/ast/nullability/FieldComparedWithNull.java b/j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull.java similarity index 100% rename from j2k/tests/testData/ast/nullability/FieldComparedWithNull.java rename to j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull.java diff --git a/j2k/tests/testData/ast/nullability/FieldComparedWithNull.kt b/j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/FieldComparedWithNull.kt rename to j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull.kt diff --git a/j2k/tests/testData/ast/nullability/FieldComparedWithNull2.java b/j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull2.java similarity index 100% rename from j2k/tests/testData/ast/nullability/FieldComparedWithNull2.java rename to j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull2.java diff --git a/j2k/tests/testData/ast/nullability/FieldComparedWithNull2.kt b/j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull2.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/FieldComparedWithNull2.kt rename to j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull2.kt diff --git a/j2k/tests/testData/ast/nullability/FieldComparedWithNull3.java b/j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull3.java similarity index 100% rename from j2k/tests/testData/ast/nullability/FieldComparedWithNull3.java rename to j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull3.java diff --git a/j2k/tests/testData/ast/nullability/FieldComparedWithNull3.kt b/j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull3.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/FieldComparedWithNull3.kt rename to j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull3.kt diff --git a/j2k/tests/testData/ast/nullability/FieldComparedWithNull4.java b/j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull4.java similarity index 100% rename from j2k/tests/testData/ast/nullability/FieldComparedWithNull4.java rename to j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull4.java diff --git a/j2k/tests/testData/ast/nullability/FieldComparedWithNull4.kt b/j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull4.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/FieldComparedWithNull4.kt rename to j2k/tests/testData/fileOrElement/nullability/FieldComparedWithNull4.kt diff --git a/j2k/tests/testData/ast/nullability/FieldInitializedWithNull.java b/j2k/tests/testData/fileOrElement/nullability/FieldInitializedWithNull.java similarity index 100% rename from j2k/tests/testData/ast/nullability/FieldInitializedWithNull.java rename to j2k/tests/testData/fileOrElement/nullability/FieldInitializedWithNull.java diff --git a/j2k/tests/testData/ast/nullability/FieldInitializedWithNull.kt b/j2k/tests/testData/fileOrElement/nullability/FieldInitializedWithNull.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/FieldInitializedWithNull.kt rename to j2k/tests/testData/fileOrElement/nullability/FieldInitializedWithNull.kt diff --git a/j2k/tests/testData/ast/nullability/IndirectOverride.java b/j2k/tests/testData/fileOrElement/nullability/IndirectOverride.java similarity index 100% rename from j2k/tests/testData/ast/nullability/IndirectOverride.java rename to j2k/tests/testData/fileOrElement/nullability/IndirectOverride.java diff --git a/j2k/tests/testData/ast/nullability/IndirectOverride.kt b/j2k/tests/testData/fileOrElement/nullability/IndirectOverride.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/IndirectOverride.kt rename to j2k/tests/testData/fileOrElement/nullability/IndirectOverride.kt diff --git a/j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg.java b/j2k/tests/testData/fileOrElement/nullability/MethodInvokedWithNullArg.java similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg.java rename to j2k/tests/testData/fileOrElement/nullability/MethodInvokedWithNullArg.java diff --git a/j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg.kt b/j2k/tests/testData/fileOrElement/nullability/MethodInvokedWithNullArg.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg.kt rename to j2k/tests/testData/fileOrElement/nullability/MethodInvokedWithNullArg.kt diff --git a/j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg2.java b/j2k/tests/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.java similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg2.java rename to j2k/tests/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.java diff --git a/j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg2.kt b/j2k/tests/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg2.kt rename to j2k/tests/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.kt diff --git a/j2k/tests/testData/ast/nullability/MethodInvokedWithTernaryNullArg.java b/j2k/tests/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.java similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodInvokedWithTernaryNullArg.java rename to j2k/tests/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.java diff --git a/j2k/tests/testData/ast/nullability/MethodInvokedWithTernaryNullArg.kt b/j2k/tests/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodInvokedWithTernaryNullArg.kt rename to j2k/tests/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.kt diff --git a/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull.java b/j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull.java similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodResultComparedWithNull.java rename to j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull.java diff --git a/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull.kt b/j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodResultComparedWithNull.kt rename to j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull.kt diff --git a/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull2.java b/j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull2.java similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodResultComparedWithNull2.java rename to j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull2.java diff --git a/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull2.kt b/j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull2.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodResultComparedWithNull2.kt rename to j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull2.kt diff --git a/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull3.java b/j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull3.java similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodResultComparedWithNull3.java rename to j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull3.java diff --git a/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull3.kt b/j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull3.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodResultComparedWithNull3.kt rename to j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull3.kt diff --git a/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull4.java b/j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull4.java similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodResultComparedWithNull4.java rename to j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull4.java diff --git a/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull4.kt b/j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull4.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodResultComparedWithNull4.kt rename to j2k/tests/testData/fileOrElement/nullability/MethodResultComparedWithNull4.kt diff --git a/j2k/tests/testData/ast/nullability/MethodResultInitializesNullableField.java b/j2k/tests/testData/fileOrElement/nullability/MethodResultInitializesNullableField.java similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodResultInitializesNullableField.java rename to j2k/tests/testData/fileOrElement/nullability/MethodResultInitializesNullableField.java diff --git a/j2k/tests/testData/ast/nullability/MethodResultInitializesNullableField.kt b/j2k/tests/testData/fileOrElement/nullability/MethodResultInitializesNullableField.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodResultInitializesNullableField.kt rename to j2k/tests/testData/fileOrElement/nullability/MethodResultInitializesNullableField.kt diff --git a/j2k/tests/testData/ast/nullability/MethodReturnsNull.java b/j2k/tests/testData/fileOrElement/nullability/MethodReturnsNull.java similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodReturnsNull.java rename to j2k/tests/testData/fileOrElement/nullability/MethodReturnsNull.java diff --git a/j2k/tests/testData/ast/nullability/MethodReturnsNull.kt b/j2k/tests/testData/fileOrElement/nullability/MethodReturnsNull.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodReturnsNull.kt rename to j2k/tests/testData/fileOrElement/nullability/MethodReturnsNull.kt diff --git a/j2k/tests/testData/ast/nullability/MethodReturnsNullInAnonymousClass.java b/j2k/tests/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.java similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodReturnsNullInAnonymousClass.java rename to j2k/tests/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.java diff --git a/j2k/tests/testData/ast/nullability/MethodReturnsNullInAnonymousClass.kt b/j2k/tests/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodReturnsNullInAnonymousClass.kt rename to j2k/tests/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.kt diff --git a/j2k/tests/testData/ast/nullability/MethodReturnsNullInLocalClass.java b/j2k/tests/testData/fileOrElement/nullability/MethodReturnsNullInLocalClass.java similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodReturnsNullInLocalClass.java rename to j2k/tests/testData/fileOrElement/nullability/MethodReturnsNullInLocalClass.java diff --git a/j2k/tests/testData/ast/nullability/MethodReturnsNullInLocalClass.kt b/j2k/tests/testData/fileOrElement/nullability/MethodReturnsNullInLocalClass.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodReturnsNullInLocalClass.kt rename to j2k/tests/testData/fileOrElement/nullability/MethodReturnsNullInLocalClass.kt diff --git a/j2k/tests/testData/ast/nullability/MethodReturnsTernaryNull.java b/j2k/tests/testData/fileOrElement/nullability/MethodReturnsTernaryNull.java similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodReturnsTernaryNull.java rename to j2k/tests/testData/fileOrElement/nullability/MethodReturnsTernaryNull.java diff --git a/j2k/tests/testData/ast/nullability/MethodReturnsTernaryNull.kt b/j2k/tests/testData/fileOrElement/nullability/MethodReturnsTernaryNull.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/MethodReturnsTernaryNull.kt rename to j2k/tests/testData/fileOrElement/nullability/MethodReturnsTernaryNull.kt diff --git a/j2k/tests/testData/ast/nullability/NullableIntNoCrash.java b/j2k/tests/testData/fileOrElement/nullability/NullableIntNoCrash.java similarity index 100% rename from j2k/tests/testData/ast/nullability/NullableIntNoCrash.java rename to j2k/tests/testData/fileOrElement/nullability/NullableIntNoCrash.java diff --git a/j2k/tests/testData/ast/nullability/NullableIntNoCrash.kt b/j2k/tests/testData/fileOrElement/nullability/NullableIntNoCrash.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/NullableIntNoCrash.kt rename to j2k/tests/testData/fileOrElement/nullability/NullableIntNoCrash.kt diff --git a/j2k/tests/testData/ast/nullability/NullableMethodDotAccess.java b/j2k/tests/testData/fileOrElement/nullability/NullableMethodDotAccess.java similarity index 100% rename from j2k/tests/testData/ast/nullability/NullableMethodDotAccess.java rename to j2k/tests/testData/fileOrElement/nullability/NullableMethodDotAccess.java diff --git a/j2k/tests/testData/ast/nullability/NullableMethodDotAccess.kt b/j2k/tests/testData/fileOrElement/nullability/NullableMethodDotAccess.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/NullableMethodDotAccess.kt rename to j2k/tests/testData/fileOrElement/nullability/NullableMethodDotAccess.kt diff --git a/j2k/tests/testData/ast/nullability/NullableVariableDotAccess.java b/j2k/tests/testData/fileOrElement/nullability/NullableVariableDotAccess.java similarity index 100% rename from j2k/tests/testData/ast/nullability/NullableVariableDotAccess.java rename to j2k/tests/testData/fileOrElement/nullability/NullableVariableDotAccess.java diff --git a/j2k/tests/testData/ast/nullability/NullableVariableDotAccess.kt b/j2k/tests/testData/fileOrElement/nullability/NullableVariableDotAccess.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/NullableVariableDotAccess.kt rename to j2k/tests/testData/fileOrElement/nullability/NullableVariableDotAccess.kt diff --git a/j2k/tests/testData/ast/nullability/OverrideWithInheritanceLoop.java b/j2k/tests/testData/fileOrElement/nullability/OverrideWithInheritanceLoop.java similarity index 100% rename from j2k/tests/testData/ast/nullability/OverrideWithInheritanceLoop.java rename to j2k/tests/testData/fileOrElement/nullability/OverrideWithInheritanceLoop.java diff --git a/j2k/tests/testData/ast/nullability/OverrideWithInheritanceLoop.kt b/j2k/tests/testData/fileOrElement/nullability/OverrideWithInheritanceLoop.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/OverrideWithInheritanceLoop.kt rename to j2k/tests/testData/fileOrElement/nullability/OverrideWithInheritanceLoop.kt diff --git a/j2k/tests/testData/ast/nullability/Overrides.java b/j2k/tests/testData/fileOrElement/nullability/Overrides.java similarity index 100% rename from j2k/tests/testData/ast/nullability/Overrides.java rename to j2k/tests/testData/fileOrElement/nullability/Overrides.java diff --git a/j2k/tests/testData/ast/nullability/Overrides.kt b/j2k/tests/testData/fileOrElement/nullability/Overrides.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/Overrides.kt rename to j2k/tests/testData/fileOrElement/nullability/Overrides.kt diff --git a/j2k/tests/testData/ast/nullability/ParameterComparedWithNull.java b/j2k/tests/testData/fileOrElement/nullability/ParameterComparedWithNull.java similarity index 100% rename from j2k/tests/testData/ast/nullability/ParameterComparedWithNull.java rename to j2k/tests/testData/fileOrElement/nullability/ParameterComparedWithNull.java diff --git a/j2k/tests/testData/ast/nullability/ParameterComparedWithNull.kt b/j2k/tests/testData/fileOrElement/nullability/ParameterComparedWithNull.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/ParameterComparedWithNull.kt rename to j2k/tests/testData/fileOrElement/nullability/ParameterComparedWithNull.kt diff --git a/j2k/tests/testData/ast/nullability/VariableAssignedWithNull.java b/j2k/tests/testData/fileOrElement/nullability/VariableAssignedWithNull.java similarity index 100% rename from j2k/tests/testData/ast/nullability/VariableAssignedWithNull.java rename to j2k/tests/testData/fileOrElement/nullability/VariableAssignedWithNull.java diff --git a/j2k/tests/testData/ast/nullability/VariableAssignedWithNull.kt b/j2k/tests/testData/fileOrElement/nullability/VariableAssignedWithNull.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/VariableAssignedWithNull.kt rename to j2k/tests/testData/fileOrElement/nullability/VariableAssignedWithNull.kt diff --git a/j2k/tests/testData/ast/nullability/VariableComparedWithNull.java b/j2k/tests/testData/fileOrElement/nullability/VariableComparedWithNull.java similarity index 100% rename from j2k/tests/testData/ast/nullability/VariableComparedWithNull.java rename to j2k/tests/testData/fileOrElement/nullability/VariableComparedWithNull.java diff --git a/j2k/tests/testData/ast/nullability/VariableComparedWithNull.kt b/j2k/tests/testData/fileOrElement/nullability/VariableComparedWithNull.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/VariableComparedWithNull.kt rename to j2k/tests/testData/fileOrElement/nullability/VariableComparedWithNull.kt diff --git a/j2k/tests/testData/ast/nullability/VariableInitializedWithNull.java b/j2k/tests/testData/fileOrElement/nullability/VariableInitializedWithNull.java similarity index 100% rename from j2k/tests/testData/ast/nullability/VariableInitializedWithNull.java rename to j2k/tests/testData/fileOrElement/nullability/VariableInitializedWithNull.java diff --git a/j2k/tests/testData/ast/nullability/VariableInitializedWithNull.kt b/j2k/tests/testData/fileOrElement/nullability/VariableInitializedWithNull.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/VariableInitializedWithNull.kt rename to j2k/tests/testData/fileOrElement/nullability/VariableInitializedWithNull.kt diff --git a/j2k/tests/testData/ast/nullability/VariableInitializedWithTernaryNull.java b/j2k/tests/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.java similarity index 100% rename from j2k/tests/testData/ast/nullability/VariableInitializedWithTernaryNull.java rename to j2k/tests/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.java diff --git a/j2k/tests/testData/ast/nullability/VariableInitializedWithTernaryNull.kt b/j2k/tests/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/VariableInitializedWithTernaryNull.kt rename to j2k/tests/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.kt diff --git a/j2k/tests/testData/ast/nullability/autoNotNull.java b/j2k/tests/testData/fileOrElement/nullability/autoNotNull.java similarity index 100% rename from j2k/tests/testData/ast/nullability/autoNotNull.java rename to j2k/tests/testData/fileOrElement/nullability/autoNotNull.java diff --git a/j2k/tests/testData/ast/nullability/autoNotNull.kt b/j2k/tests/testData/fileOrElement/nullability/autoNotNull.kt similarity index 100% rename from j2k/tests/testData/ast/nullability/autoNotNull.kt rename to j2k/tests/testData/fileOrElement/nullability/autoNotNull.kt diff --git a/j2k/tests/testData/ast/objectLiteral/MyFrame.java b/j2k/tests/testData/fileOrElement/objectLiteral/MyFrame.java similarity index 100% rename from j2k/tests/testData/ast/objectLiteral/MyFrame.java rename to j2k/tests/testData/fileOrElement/objectLiteral/MyFrame.java diff --git a/j2k/tests/testData/ast/objectLiteral/MyFrame.kt b/j2k/tests/testData/fileOrElement/objectLiteral/MyFrame.kt similarity index 100% rename from j2k/tests/testData/ast/objectLiteral/MyFrame.kt rename to j2k/tests/testData/fileOrElement/objectLiteral/MyFrame.kt diff --git a/j2k/tests/testData/ast/outProjectionType/methodParams.java b/j2k/tests/testData/fileOrElement/outProjectionType/methodParams.java similarity index 100% rename from j2k/tests/testData/ast/outProjectionType/methodParams.java rename to j2k/tests/testData/fileOrElement/outProjectionType/methodParams.java diff --git a/j2k/tests/testData/ast/outProjectionType/methodParams.kt b/j2k/tests/testData/fileOrElement/outProjectionType/methodParams.kt similarity index 100% rename from j2k/tests/testData/ast/outProjectionType/methodParams.kt rename to j2k/tests/testData/fileOrElement/outProjectionType/methodParams.kt diff --git a/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.java b/j2k/tests/testData/fileOrElement/packageStatement/orgJetbrainsJetJ2kIn.java similarity index 100% rename from j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.java rename to j2k/tests/testData/fileOrElement/packageStatement/orgJetbrainsJetJ2kIn.java diff --git a/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt b/j2k/tests/testData/fileOrElement/packageStatement/orgJetbrainsJetJ2kIn.kt similarity index 100% rename from j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt rename to j2k/tests/testData/fileOrElement/packageStatement/orgJetbrainsJetJ2kIn.kt diff --git a/j2k/tests/testData/ast/parenthesizedExpression/parenthesized.java b/j2k/tests/testData/fileOrElement/parenthesizedExpression/parenthesized.java similarity index 100% rename from j2k/tests/testData/ast/parenthesizedExpression/parenthesized.java rename to j2k/tests/testData/fileOrElement/parenthesizedExpression/parenthesized.java diff --git a/j2k/tests/testData/ast/parenthesizedExpression/parenthesized.kt b/j2k/tests/testData/fileOrElement/parenthesizedExpression/parenthesized.kt similarity index 100% rename from j2k/tests/testData/ast/parenthesizedExpression/parenthesized.kt rename to j2k/tests/testData/fileOrElement/parenthesizedExpression/parenthesized.kt diff --git a/j2k/tests/testData/ast/parenthesizedExpression/parenthesized2.java b/j2k/tests/testData/fileOrElement/parenthesizedExpression/parenthesized2.java similarity index 100% rename from j2k/tests/testData/ast/parenthesizedExpression/parenthesized2.java rename to j2k/tests/testData/fileOrElement/parenthesizedExpression/parenthesized2.java diff --git a/j2k/tests/testData/ast/parenthesizedExpression/parenthesized2.kt b/j2k/tests/testData/fileOrElement/parenthesizedExpression/parenthesized2.kt similarity index 100% rename from j2k/tests/testData/ast/parenthesizedExpression/parenthesized2.kt rename to j2k/tests/testData/fileOrElement/parenthesizedExpression/parenthesized2.kt diff --git a/j2k/tests/testData/ast/polyadicExpression/divide.java b/j2k/tests/testData/fileOrElement/polyadicExpression/divide.java similarity index 100% rename from j2k/tests/testData/ast/polyadicExpression/divide.java rename to j2k/tests/testData/fileOrElement/polyadicExpression/divide.java diff --git a/j2k/tests/testData/ast/polyadicExpression/divide.kt b/j2k/tests/testData/fileOrElement/polyadicExpression/divide.kt similarity index 100% rename from j2k/tests/testData/ast/polyadicExpression/divide.kt rename to j2k/tests/testData/fileOrElement/polyadicExpression/divide.kt diff --git a/j2k/tests/testData/ast/polyadicExpression/minus.java b/j2k/tests/testData/fileOrElement/polyadicExpression/minus.java similarity index 100% rename from j2k/tests/testData/ast/polyadicExpression/minus.java rename to j2k/tests/testData/fileOrElement/polyadicExpression/minus.java diff --git a/j2k/tests/testData/ast/polyadicExpression/minus.kt b/j2k/tests/testData/fileOrElement/polyadicExpression/minus.kt similarity index 100% rename from j2k/tests/testData/ast/polyadicExpression/minus.kt rename to j2k/tests/testData/fileOrElement/polyadicExpression/minus.kt diff --git a/j2k/tests/testData/ast/polyadicExpression/multiply.java b/j2k/tests/testData/fileOrElement/polyadicExpression/multiply.java similarity index 100% rename from j2k/tests/testData/ast/polyadicExpression/multiply.java rename to j2k/tests/testData/fileOrElement/polyadicExpression/multiply.java diff --git a/j2k/tests/testData/ast/polyadicExpression/multiply.kt b/j2k/tests/testData/fileOrElement/polyadicExpression/multiply.kt similarity index 100% rename from j2k/tests/testData/ast/polyadicExpression/multiply.kt rename to j2k/tests/testData/fileOrElement/polyadicExpression/multiply.kt diff --git a/j2k/tests/testData/ast/polyadicExpression/plus.java b/j2k/tests/testData/fileOrElement/polyadicExpression/plus.java similarity index 100% rename from j2k/tests/testData/ast/polyadicExpression/plus.java rename to j2k/tests/testData/fileOrElement/polyadicExpression/plus.java diff --git a/j2k/tests/testData/ast/polyadicExpression/plus.kt b/j2k/tests/testData/fileOrElement/polyadicExpression/plus.kt similarity index 100% rename from j2k/tests/testData/ast/polyadicExpression/plus.kt rename to j2k/tests/testData/fileOrElement/polyadicExpression/plus.kt diff --git a/j2k/tests/testData/ast/polyadicExpression/remainder.java b/j2k/tests/testData/fileOrElement/polyadicExpression/remainder.java similarity index 100% rename from j2k/tests/testData/ast/polyadicExpression/remainder.java rename to j2k/tests/testData/fileOrElement/polyadicExpression/remainder.java diff --git a/j2k/tests/testData/ast/polyadicExpression/remainder.kt b/j2k/tests/testData/fileOrElement/polyadicExpression/remainder.kt similarity index 100% rename from j2k/tests/testData/ast/polyadicExpression/remainder.kt rename to j2k/tests/testData/fileOrElement/polyadicExpression/remainder.kt diff --git a/j2k/tests/testData/ast/polyadicExpression/unassignedShiftRight.java b/j2k/tests/testData/fileOrElement/polyadicExpression/unassignedShiftRight.java similarity index 100% rename from j2k/tests/testData/ast/polyadicExpression/unassignedShiftRight.java rename to j2k/tests/testData/fileOrElement/polyadicExpression/unassignedShiftRight.java diff --git a/j2k/tests/testData/ast/polyadicExpression/unassignedShiftRight.kt b/j2k/tests/testData/fileOrElement/polyadicExpression/unassignedShiftRight.kt similarity index 100% rename from j2k/tests/testData/ast/polyadicExpression/unassignedShiftRight.kt rename to j2k/tests/testData/fileOrElement/polyadicExpression/unassignedShiftRight.kt diff --git a/j2k/tests/testData/ast/postfixOperator/decrement.java b/j2k/tests/testData/fileOrElement/postfixOperator/decrement.java similarity index 100% rename from j2k/tests/testData/ast/postfixOperator/decrement.java rename to j2k/tests/testData/fileOrElement/postfixOperator/decrement.java diff --git a/j2k/tests/testData/ast/postfixOperator/decrement.kt b/j2k/tests/testData/fileOrElement/postfixOperator/decrement.kt similarity index 100% rename from j2k/tests/testData/ast/postfixOperator/decrement.kt rename to j2k/tests/testData/fileOrElement/postfixOperator/decrement.kt diff --git a/j2k/tests/testData/ast/postfixOperator/increment.java b/j2k/tests/testData/fileOrElement/postfixOperator/increment.java similarity index 100% rename from j2k/tests/testData/ast/postfixOperator/increment.java rename to j2k/tests/testData/fileOrElement/postfixOperator/increment.java diff --git a/j2k/tests/testData/ast/postfixOperator/increment.kt b/j2k/tests/testData/fileOrElement/postfixOperator/increment.kt similarity index 100% rename from j2k/tests/testData/ast/postfixOperator/increment.kt rename to j2k/tests/testData/fileOrElement/postfixOperator/increment.kt diff --git a/j2k/tests/testData/ast/prefixOperator/decrement.java b/j2k/tests/testData/fileOrElement/prefixOperator/decrement.java similarity index 100% rename from j2k/tests/testData/ast/prefixOperator/decrement.java rename to j2k/tests/testData/fileOrElement/prefixOperator/decrement.java diff --git a/j2k/tests/testData/ast/prefixOperator/decrement.kt b/j2k/tests/testData/fileOrElement/prefixOperator/decrement.kt similarity index 100% rename from j2k/tests/testData/ast/prefixOperator/decrement.kt rename to j2k/tests/testData/fileOrElement/prefixOperator/decrement.kt diff --git a/j2k/tests/testData/ast/prefixOperator/excl.java b/j2k/tests/testData/fileOrElement/prefixOperator/excl.java similarity index 100% rename from j2k/tests/testData/ast/prefixOperator/excl.java rename to j2k/tests/testData/fileOrElement/prefixOperator/excl.java diff --git a/j2k/tests/testData/ast/prefixOperator/excl.kt b/j2k/tests/testData/fileOrElement/prefixOperator/excl.kt similarity index 100% rename from j2k/tests/testData/ast/prefixOperator/excl.kt rename to j2k/tests/testData/fileOrElement/prefixOperator/excl.kt diff --git a/j2k/tests/testData/ast/prefixOperator/increment.java b/j2k/tests/testData/fileOrElement/prefixOperator/increment.java similarity index 100% rename from j2k/tests/testData/ast/prefixOperator/increment.java rename to j2k/tests/testData/fileOrElement/prefixOperator/increment.java diff --git a/j2k/tests/testData/ast/prefixOperator/increment.kt b/j2k/tests/testData/fileOrElement/prefixOperator/increment.kt similarity index 100% rename from j2k/tests/testData/ast/prefixOperator/increment.kt rename to j2k/tests/testData/fileOrElement/prefixOperator/increment.kt diff --git a/j2k/tests/testData/ast/prefixOperator/kt-667.java b/j2k/tests/testData/fileOrElement/prefixOperator/kt-667.java similarity index 100% rename from j2k/tests/testData/ast/prefixOperator/kt-667.java rename to j2k/tests/testData/fileOrElement/prefixOperator/kt-667.java diff --git a/j2k/tests/testData/ast/prefixOperator/kt-667.kt b/j2k/tests/testData/fileOrElement/prefixOperator/kt-667.kt similarity index 100% rename from j2k/tests/testData/ast/prefixOperator/kt-667.kt rename to j2k/tests/testData/fileOrElement/prefixOperator/kt-667.kt diff --git a/j2k/tests/testData/ast/prefixOperator/nullableIf.java b/j2k/tests/testData/fileOrElement/prefixOperator/nullableIf.java similarity index 100% rename from j2k/tests/testData/ast/prefixOperator/nullableIf.java rename to j2k/tests/testData/fileOrElement/prefixOperator/nullableIf.java diff --git a/j2k/tests/testData/ast/prefixOperator/nullableIf.kt b/j2k/tests/testData/fileOrElement/prefixOperator/nullableIf.kt similarity index 100% rename from j2k/tests/testData/ast/prefixOperator/nullableIf.kt rename to j2k/tests/testData/fileOrElement/prefixOperator/nullableIf.kt diff --git a/j2k/tests/testData/ast/prefixOperator/tilde.java b/j2k/tests/testData/fileOrElement/prefixOperator/tilde.java similarity index 100% rename from j2k/tests/testData/ast/prefixOperator/tilde.java rename to j2k/tests/testData/fileOrElement/prefixOperator/tilde.java diff --git a/j2k/tests/testData/ast/prefixOperator/tilde.kt b/j2k/tests/testData/fileOrElement/prefixOperator/tilde.kt similarity index 100% rename from j2k/tests/testData/ast/prefixOperator/tilde.kt rename to j2k/tests/testData/fileOrElement/prefixOperator/tilde.kt diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540-map.java b/j2k/tests/testData/fileOrElement/rawGenerics/kt-540-map.java similarity index 100% rename from j2k/tests/testData/ast/rawGenerics/kt-540-map.java rename to j2k/tests/testData/fileOrElement/rawGenerics/kt-540-map.java diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540-map.kt b/j2k/tests/testData/fileOrElement/rawGenerics/kt-540-map.kt similarity index 100% rename from j2k/tests/testData/ast/rawGenerics/kt-540-map.kt rename to j2k/tests/testData/fileOrElement/rawGenerics/kt-540-map.kt diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.java b/j2k/tests/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.java similarity index 100% rename from j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.java rename to j2k/tests/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.java diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt b/j2k/tests/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.kt similarity index 100% rename from j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt rename to j2k/tests/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.kt diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540.java b/j2k/tests/testData/fileOrElement/rawGenerics/kt-540.java similarity index 100% rename from j2k/tests/testData/ast/rawGenerics/kt-540.java rename to j2k/tests/testData/fileOrElement/rawGenerics/kt-540.java diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540.kt b/j2k/tests/testData/fileOrElement/rawGenerics/kt-540.kt similarity index 100% rename from j2k/tests/testData/ast/rawGenerics/kt-540.kt rename to j2k/tests/testData/fileOrElement/rawGenerics/kt-540.kt diff --git a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.java b/j2k/tests/testData/fileOrElement/rawGenerics/rawGenericMethod.java similarity index 100% rename from j2k/tests/testData/ast/rawGenerics/rawGenericMethod.java rename to j2k/tests/testData/fileOrElement/rawGenerics/rawGenericMethod.java diff --git a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt b/j2k/tests/testData/fileOrElement/rawGenerics/rawGenericMethod.kt similarity index 100% rename from j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt rename to j2k/tests/testData/fileOrElement/rawGenerics/rawGenericMethod.kt diff --git a/j2k/tests/testData/ast/returnStatement/currentMethodBug.java b/j2k/tests/testData/fileOrElement/returnStatement/currentMethodBug.java similarity index 100% rename from j2k/tests/testData/ast/returnStatement/currentMethodBug.java rename to j2k/tests/testData/fileOrElement/returnStatement/currentMethodBug.java diff --git a/j2k/tests/testData/ast/returnStatement/currentMethodBug.kt b/j2k/tests/testData/fileOrElement/returnStatement/currentMethodBug.kt similarity index 100% rename from j2k/tests/testData/ast/returnStatement/currentMethodBug.kt rename to j2k/tests/testData/fileOrElement/returnStatement/currentMethodBug.kt diff --git a/j2k/tests/testData/ast/returnStatement/returnChar.java b/j2k/tests/testData/fileOrElement/returnStatement/returnChar.java similarity index 100% rename from j2k/tests/testData/ast/returnStatement/returnChar.java rename to j2k/tests/testData/fileOrElement/returnStatement/returnChar.java diff --git a/j2k/tests/testData/ast/returnStatement/returnChar.kt b/j2k/tests/testData/fileOrElement/returnStatement/returnChar.kt similarity index 100% rename from j2k/tests/testData/ast/returnStatement/returnChar.kt rename to j2k/tests/testData/fileOrElement/returnStatement/returnChar.kt diff --git a/j2k/tests/testData/ast/returnStatement/returnLiteral.java b/j2k/tests/testData/fileOrElement/returnStatement/returnLiteral.java similarity index 100% rename from j2k/tests/testData/ast/returnStatement/returnLiteral.java rename to j2k/tests/testData/fileOrElement/returnStatement/returnLiteral.java diff --git a/j2k/tests/testData/ast/returnStatement/returnLiteral.kt b/j2k/tests/testData/fileOrElement/returnStatement/returnLiteral.kt similarity index 100% rename from j2k/tests/testData/ast/returnStatement/returnLiteral.kt rename to j2k/tests/testData/fileOrElement/returnStatement/returnLiteral.kt diff --git a/j2k/tests/testData/ast/returnStatement/returnNumber.java b/j2k/tests/testData/fileOrElement/returnStatement/returnNumber.java similarity index 100% rename from j2k/tests/testData/ast/returnStatement/returnNumber.java rename to j2k/tests/testData/fileOrElement/returnStatement/returnNumber.java diff --git a/j2k/tests/testData/ast/returnStatement/returnNumber.kt b/j2k/tests/testData/fileOrElement/returnStatement/returnNumber.kt similarity index 100% rename from j2k/tests/testData/ast/returnStatement/returnNumber.kt rename to j2k/tests/testData/fileOrElement/returnStatement/returnNumber.kt diff --git a/j2k/tests/testData/ast/returnStatement/returnString.java b/j2k/tests/testData/fileOrElement/returnStatement/returnString.java similarity index 100% rename from j2k/tests/testData/ast/returnStatement/returnString.java rename to j2k/tests/testData/fileOrElement/returnStatement/returnString.java diff --git a/j2k/tests/testData/ast/returnStatement/returnString.kt b/j2k/tests/testData/fileOrElement/returnStatement/returnString.kt similarity index 100% rename from j2k/tests/testData/ast/returnStatement/returnString.kt rename to j2k/tests/testData/fileOrElement/returnStatement/returnString.kt diff --git a/j2k/tests/testData/ast/settings/openByDefault.java b/j2k/tests/testData/fileOrElement/settings/openByDefault.java similarity index 100% rename from j2k/tests/testData/ast/settings/openByDefault.java rename to j2k/tests/testData/fileOrElement/settings/openByDefault.java diff --git a/j2k/tests/testData/ast/settings/openByDefault.kt b/j2k/tests/testData/fileOrElement/settings/openByDefault.kt similarity index 100% rename from j2k/tests/testData/ast/settings/openByDefault.kt rename to j2k/tests/testData/fileOrElement/settings/openByDefault.kt diff --git a/j2k/tests/testData/ast/settings/specifyFieldTypeByDefault.java b/j2k/tests/testData/fileOrElement/settings/specifyFieldTypeByDefault.java similarity index 100% rename from j2k/tests/testData/ast/settings/specifyFieldTypeByDefault.java rename to j2k/tests/testData/fileOrElement/settings/specifyFieldTypeByDefault.java diff --git a/j2k/tests/testData/ast/settings/specifyFieldTypeByDefault.kt b/j2k/tests/testData/fileOrElement/settings/specifyFieldTypeByDefault.kt similarity index 100% rename from j2k/tests/testData/ast/settings/specifyFieldTypeByDefault.kt rename to j2k/tests/testData/fileOrElement/settings/specifyFieldTypeByDefault.kt diff --git a/j2k/tests/testData/ast/settings/specifyLocalVariableTypeByDefault.java b/j2k/tests/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.java similarity index 100% rename from j2k/tests/testData/ast/settings/specifyLocalVariableTypeByDefault.java rename to j2k/tests/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.java diff --git a/j2k/tests/testData/ast/settings/specifyLocalVariableTypeByDefault.kt b/j2k/tests/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.kt similarity index 100% rename from j2k/tests/testData/ast/settings/specifyLocalVariableTypeByDefault.kt rename to j2k/tests/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.kt diff --git a/j2k/tests/testData/ast/settings/specifyLocalVariableTypeByDefaultInFor.java b/j2k/tests/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.java similarity index 100% rename from j2k/tests/testData/ast/settings/specifyLocalVariableTypeByDefaultInFor.java rename to j2k/tests/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.java diff --git a/j2k/tests/testData/ast/settings/specifyLocalVariableTypeByDefaultInFor.kt b/j2k/tests/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.kt similarity index 100% rename from j2k/tests/testData/ast/settings/specifyLocalVariableTypeByDefaultInFor.kt rename to j2k/tests/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.kt diff --git a/j2k/tests/testData/ast/starProjectionType/methodParams.java b/j2k/tests/testData/fileOrElement/starProjectionType/methodParams.java similarity index 100% rename from j2k/tests/testData/ast/starProjectionType/methodParams.java rename to j2k/tests/testData/fileOrElement/starProjectionType/methodParams.java diff --git a/j2k/tests/testData/ast/starProjectionType/methodParams.kt b/j2k/tests/testData/fileOrElement/starProjectionType/methodParams.kt similarity index 100% rename from j2k/tests/testData/ast/starProjectionType/methodParams.kt rename to j2k/tests/testData/fileOrElement/starProjectionType/methodParams.kt diff --git a/j2k/tests/testData/ast/staticMembers/PrivateStaticMembers.java b/j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMembers.java similarity index 100% rename from j2k/tests/testData/ast/staticMembers/PrivateStaticMembers.java rename to j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMembers.java diff --git a/j2k/tests/testData/ast/staticMembers/PrivateStaticMembers.kt b/j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMembers.kt similarity index 100% rename from j2k/tests/testData/ast/staticMembers/PrivateStaticMembers.kt rename to j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMembers.kt diff --git a/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods1.java b/j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods1.java similarity index 100% rename from j2k/tests/testData/ast/staticMembers/PrivateStaticMethods1.java rename to j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods1.java diff --git a/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods1.kt b/j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods1.kt similarity index 100% rename from j2k/tests/testData/ast/staticMembers/PrivateStaticMethods1.kt rename to j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods1.kt diff --git a/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods2.java b/j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods2.java similarity index 100% rename from j2k/tests/testData/ast/staticMembers/PrivateStaticMethods2.java rename to j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods2.java diff --git a/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods2.kt b/j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods2.kt similarity index 100% rename from j2k/tests/testData/ast/staticMembers/PrivateStaticMethods2.kt rename to j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods2.kt diff --git a/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods3.java b/j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods3.java similarity index 100% rename from j2k/tests/testData/ast/staticMembers/PrivateStaticMethods3.java rename to j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods3.java diff --git a/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods3.kt b/j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods3.kt similarity index 100% rename from j2k/tests/testData/ast/staticMembers/PrivateStaticMethods3.kt rename to j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods3.kt diff --git a/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods4.java b/j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods4.java similarity index 100% rename from j2k/tests/testData/ast/staticMembers/PrivateStaticMethods4.java rename to j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods4.java diff --git a/j2k/tests/testData/ast/staticMembers/PrivateStaticMethods4.kt b/j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods4.kt similarity index 100% rename from j2k/tests/testData/ast/staticMembers/PrivateStaticMethods4.kt rename to j2k/tests/testData/fileOrElement/staticMembers/PrivateStaticMethods4.kt diff --git a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.java b/j2k/tests/testData/fileOrElement/superExpression/classAdotSuperFoo.java similarity index 100% rename from j2k/tests/testData/ast/superExpression/classAdotSuperFoo.java rename to j2k/tests/testData/fileOrElement/superExpression/classAdotSuperFoo.java diff --git a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt b/j2k/tests/testData/fileOrElement/superExpression/classAdotSuperFoo.kt similarity index 100% rename from j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt rename to j2k/tests/testData/fileOrElement/superExpression/classAdotSuperFoo.kt diff --git a/j2k/tests/testData/ast/superExpression/classAextendsB.java b/j2k/tests/testData/fileOrElement/superExpression/classAextendsB.java similarity index 100% rename from j2k/tests/testData/ast/superExpression/classAextendsB.java rename to j2k/tests/testData/fileOrElement/superExpression/classAextendsB.java diff --git a/j2k/tests/testData/ast/superExpression/classAextendsB.kt b/j2k/tests/testData/fileOrElement/superExpression/classAextendsB.kt similarity index 100% rename from j2k/tests/testData/ast/superExpression/classAextendsB.kt rename to j2k/tests/testData/fileOrElement/superExpression/classAextendsB.kt diff --git a/j2k/tests/testData/ast/superExpression/superStatement.java b/j2k/tests/testData/fileOrElement/superExpression/superStatement.java similarity index 100% rename from j2k/tests/testData/ast/superExpression/superStatement.java rename to j2k/tests/testData/fileOrElement/superExpression/superStatement.java diff --git a/j2k/tests/testData/ast/superExpression/superStatement.kt b/j2k/tests/testData/fileOrElement/superExpression/superStatement.kt similarity index 100% rename from j2k/tests/testData/ast/superExpression/superStatement.kt rename to j2k/tests/testData/fileOrElement/superExpression/superStatement.kt diff --git a/j2k/tests/testData/ast/switch/caseWithBlock.java b/j2k/tests/testData/fileOrElement/switch/caseWithBlock.java similarity index 100% rename from j2k/tests/testData/ast/switch/caseWithBlock.java rename to j2k/tests/testData/fileOrElement/switch/caseWithBlock.java diff --git a/j2k/tests/testData/ast/switch/caseWithBlock.kt b/j2k/tests/testData/fileOrElement/switch/caseWithBlock.kt similarity index 100% rename from j2k/tests/testData/ast/switch/caseWithBlock.kt rename to j2k/tests/testData/fileOrElement/switch/caseWithBlock.kt diff --git a/j2k/tests/testData/ast/switch/comlicatedFallDown.java b/j2k/tests/testData/fileOrElement/switch/comlicatedFallDown.java similarity index 100% rename from j2k/tests/testData/ast/switch/comlicatedFallDown.java rename to j2k/tests/testData/fileOrElement/switch/comlicatedFallDown.java diff --git a/j2k/tests/testData/ast/switch/comlicatedFallDown.kt b/j2k/tests/testData/fileOrElement/switch/comlicatedFallDown.kt similarity index 100% rename from j2k/tests/testData/ast/switch/comlicatedFallDown.kt rename to j2k/tests/testData/fileOrElement/switch/comlicatedFallDown.kt diff --git a/j2k/tests/testData/ast/switch/continueAndBreakWithLabel.java b/j2k/tests/testData/fileOrElement/switch/continueAndBreakWithLabel.java similarity index 100% rename from j2k/tests/testData/ast/switch/continueAndBreakWithLabel.java rename to j2k/tests/testData/fileOrElement/switch/continueAndBreakWithLabel.java diff --git a/j2k/tests/testData/ast/switch/continueAndBreakWithLabel.kt b/j2k/tests/testData/fileOrElement/switch/continueAndBreakWithLabel.kt similarity index 100% rename from j2k/tests/testData/ast/switch/continueAndBreakWithLabel.kt rename to j2k/tests/testData/fileOrElement/switch/continueAndBreakWithLabel.kt diff --git a/j2k/tests/testData/ast/switch/emptySwitch.java b/j2k/tests/testData/fileOrElement/switch/emptySwitch.java similarity index 100% rename from j2k/tests/testData/ast/switch/emptySwitch.java rename to j2k/tests/testData/fileOrElement/switch/emptySwitch.java diff --git a/j2k/tests/testData/ast/switch/emptySwitch.kt b/j2k/tests/testData/fileOrElement/switch/emptySwitch.kt similarity index 100% rename from j2k/tests/testData/ast/switch/emptySwitch.kt rename to j2k/tests/testData/fileOrElement/switch/emptySwitch.kt diff --git a/j2k/tests/testData/ast/switch/enumConstants.java b/j2k/tests/testData/fileOrElement/switch/enumConstants.java similarity index 100% rename from j2k/tests/testData/ast/switch/enumConstants.java rename to j2k/tests/testData/fileOrElement/switch/enumConstants.java diff --git a/j2k/tests/testData/ast/switch/enumConstants.kt b/j2k/tests/testData/fileOrElement/switch/enumConstants.kt similarity index 100% rename from j2k/tests/testData/ast/switch/enumConstants.kt rename to j2k/tests/testData/fileOrElement/switch/enumConstants.kt diff --git a/j2k/tests/testData/ast/switch/fallDown.java b/j2k/tests/testData/fileOrElement/switch/fallDown.java similarity index 100% rename from j2k/tests/testData/ast/switch/fallDown.java rename to j2k/tests/testData/fileOrElement/switch/fallDown.java diff --git a/j2k/tests/testData/ast/switch/fallDown.kt b/j2k/tests/testData/fileOrElement/switch/fallDown.kt similarity index 100% rename from j2k/tests/testData/ast/switch/fallDown.kt rename to j2k/tests/testData/fileOrElement/switch/fallDown.kt diff --git a/j2k/tests/testData/ast/switch/fallDownWithBlocks.java b/j2k/tests/testData/fileOrElement/switch/fallDownWithBlocks.java similarity index 100% rename from j2k/tests/testData/ast/switch/fallDownWithBlocks.java rename to j2k/tests/testData/fileOrElement/switch/fallDownWithBlocks.java diff --git a/j2k/tests/testData/ast/switch/fallDownWithBlocks.kt b/j2k/tests/testData/fileOrElement/switch/fallDownWithBlocks.kt similarity index 100% rename from j2k/tests/testData/ast/switch/fallDownWithBlocks.kt rename to j2k/tests/testData/fileOrElement/switch/fallDownWithBlocks.kt diff --git a/j2k/tests/testData/ast/switch/invalidSwitch.java b/j2k/tests/testData/fileOrElement/switch/invalidSwitch.java similarity index 100% rename from j2k/tests/testData/ast/switch/invalidSwitch.java rename to j2k/tests/testData/fileOrElement/switch/invalidSwitch.java diff --git a/j2k/tests/testData/ast/switch/invalidSwitch.kt b/j2k/tests/testData/fileOrElement/switch/invalidSwitch.kt similarity index 100% rename from j2k/tests/testData/ast/switch/invalidSwitch.kt rename to j2k/tests/testData/fileOrElement/switch/invalidSwitch.kt diff --git a/j2k/tests/testData/ast/switch/kt-539.java b/j2k/tests/testData/fileOrElement/switch/kt-539.java similarity index 100% rename from j2k/tests/testData/ast/switch/kt-539.java rename to j2k/tests/testData/fileOrElement/switch/kt-539.java diff --git a/j2k/tests/testData/ast/switch/kt-539.kt b/j2k/tests/testData/fileOrElement/switch/kt-539.kt similarity index 100% rename from j2k/tests/testData/ast/switch/kt-539.kt rename to j2k/tests/testData/fileOrElement/switch/kt-539.kt diff --git a/j2k/tests/testData/ast/switch/nondefault.java b/j2k/tests/testData/fileOrElement/switch/nondefault.java similarity index 100% rename from j2k/tests/testData/ast/switch/nondefault.java rename to j2k/tests/testData/fileOrElement/switch/nondefault.java diff --git a/j2k/tests/testData/ast/switch/nondefault.kt b/j2k/tests/testData/fileOrElement/switch/nondefault.kt similarity index 100% rename from j2k/tests/testData/ast/switch/nondefault.kt rename to j2k/tests/testData/fileOrElement/switch/nondefault.kt diff --git a/j2k/tests/testData/ast/switch/returnsAndThrows.java b/j2k/tests/testData/fileOrElement/switch/returnsAndThrows.java similarity index 100% rename from j2k/tests/testData/ast/switch/returnsAndThrows.java rename to j2k/tests/testData/fileOrElement/switch/returnsAndThrows.java diff --git a/j2k/tests/testData/ast/switch/returnsAndThrows.kt b/j2k/tests/testData/fileOrElement/switch/returnsAndThrows.kt similarity index 100% rename from j2k/tests/testData/ast/switch/returnsAndThrows.kt rename to j2k/tests/testData/fileOrElement/switch/returnsAndThrows.kt diff --git a/j2k/tests/testData/ast/synchronizedStatement/singleLineExample.java b/j2k/tests/testData/fileOrElement/synchronizedStatement/singleLineExample.java similarity index 100% rename from j2k/tests/testData/ast/synchronizedStatement/singleLineExample.java rename to j2k/tests/testData/fileOrElement/synchronizedStatement/singleLineExample.java diff --git a/j2k/tests/testData/ast/synchronizedStatement/singleLineExample.kt b/j2k/tests/testData/fileOrElement/synchronizedStatement/singleLineExample.kt similarity index 100% rename from j2k/tests/testData/ast/synchronizedStatement/singleLineExample.kt rename to j2k/tests/testData/fileOrElement/synchronizedStatement/singleLineExample.kt diff --git a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.java b/j2k/tests/testData/fileOrElement/thisExpression/classAdotThisFoo.java similarity index 100% rename from j2k/tests/testData/ast/thisExpression/classAdotThisFoo.java rename to j2k/tests/testData/fileOrElement/thisExpression/classAdotThisFoo.java diff --git a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt b/j2k/tests/testData/fileOrElement/thisExpression/classAdotThisFoo.kt similarity index 100% rename from j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt rename to j2k/tests/testData/fileOrElement/thisExpression/classAdotThisFoo.kt diff --git a/j2k/tests/testData/ast/thisExpression/thisStatement.java b/j2k/tests/testData/fileOrElement/thisExpression/thisStatement.java similarity index 100% rename from j2k/tests/testData/ast/thisExpression/thisStatement.java rename to j2k/tests/testData/fileOrElement/thisExpression/thisStatement.java diff --git a/j2k/tests/testData/ast/thisExpression/thisStatement.kt b/j2k/tests/testData/fileOrElement/thisExpression/thisStatement.kt similarity index 100% rename from j2k/tests/testData/ast/thisExpression/thisStatement.kt rename to j2k/tests/testData/fileOrElement/thisExpression/thisStatement.kt diff --git a/j2k/tests/testData/ast/throwStatement/simpleThrowStatement.java b/j2k/tests/testData/fileOrElement/throwStatement/simpleThrowStatement.java similarity index 100% rename from j2k/tests/testData/ast/throwStatement/simpleThrowStatement.java rename to j2k/tests/testData/fileOrElement/throwStatement/simpleThrowStatement.java diff --git a/j2k/tests/testData/ast/throwStatement/simpleThrowStatement.kt b/j2k/tests/testData/fileOrElement/throwStatement/simpleThrowStatement.kt similarity index 100% rename from j2k/tests/testData/ast/throwStatement/simpleThrowStatement.kt rename to j2k/tests/testData/fileOrElement/throwStatement/simpleThrowStatement.kt diff --git a/j2k/tests/testData/ast/toKotlinClasses/TypeParameterBound.java b/j2k/tests/testData/fileOrElement/toKotlinClasses/TypeParameterBound.java similarity index 100% rename from j2k/tests/testData/ast/toKotlinClasses/TypeParameterBound.java rename to j2k/tests/testData/fileOrElement/toKotlinClasses/TypeParameterBound.java diff --git a/j2k/tests/testData/ast/toKotlinClasses/TypeParameterBound.kt b/j2k/tests/testData/fileOrElement/toKotlinClasses/TypeParameterBound.kt similarity index 100% rename from j2k/tests/testData/ast/toKotlinClasses/TypeParameterBound.kt rename to j2k/tests/testData/fileOrElement/toKotlinClasses/TypeParameterBound.kt diff --git a/j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator.java b/j2k/tests/testData/fileOrElement/toKotlinClasses/iterableAndIterator.java similarity index 100% rename from j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator.java rename to j2k/tests/testData/fileOrElement/toKotlinClasses/iterableAndIterator.java diff --git a/j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator.kt b/j2k/tests/testData/fileOrElement/toKotlinClasses/iterableAndIterator.kt similarity index 100% rename from j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator.kt rename to j2k/tests/testData/fileOrElement/toKotlinClasses/iterableAndIterator.kt diff --git a/j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator2.java b/j2k/tests/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.java similarity index 100% rename from j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator2.java rename to j2k/tests/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.java diff --git a/j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator2.kt b/j2k/tests/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt similarity index 100% rename from j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator2.kt rename to j2k/tests/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt diff --git a/j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator3.java b/j2k/tests/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.java similarity index 100% rename from j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator3.java rename to j2k/tests/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.java diff --git a/j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator3.kt b/j2k/tests/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.kt similarity index 100% rename from j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator3.kt rename to j2k/tests/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.kt diff --git a/j2k/tests/testData/ast/trait/abstactInterface.java b/j2k/tests/testData/fileOrElement/trait/abstactInterface.java similarity index 100% rename from j2k/tests/testData/ast/trait/abstactInterface.java rename to j2k/tests/testData/fileOrElement/trait/abstactInterface.java diff --git a/j2k/tests/testData/ast/trait/abstactInterface.kt b/j2k/tests/testData/fileOrElement/trait/abstactInterface.kt similarity index 100% rename from j2k/tests/testData/ast/trait/abstactInterface.kt rename to j2k/tests/testData/fileOrElement/trait/abstactInterface.kt diff --git a/j2k/tests/testData/ast/trait/emptyInterface.java b/j2k/tests/testData/fileOrElement/trait/emptyInterface.java similarity index 100% rename from j2k/tests/testData/ast/trait/emptyInterface.java rename to j2k/tests/testData/fileOrElement/trait/emptyInterface.java diff --git a/j2k/tests/testData/ast/trait/emptyInterface.kt b/j2k/tests/testData/fileOrElement/trait/emptyInterface.kt similarity index 100% rename from j2k/tests/testData/ast/trait/emptyInterface.kt rename to j2k/tests/testData/fileOrElement/trait/emptyInterface.kt diff --git a/j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.java b/j2k/tests/testData/fileOrElement/trait/extendsOneClassAndImplementsSeveralInterfaces.java similarity index 100% rename from j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.java rename to j2k/tests/testData/fileOrElement/trait/extendsOneClassAndImplementsSeveralInterfaces.java diff --git a/j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.kt b/j2k/tests/testData/fileOrElement/trait/extendsOneClassAndImplementsSeveralInterfaces.kt similarity index 100% rename from j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.kt rename to j2k/tests/testData/fileOrElement/trait/extendsOneClassAndImplementsSeveralInterfaces.kt diff --git a/j2k/tests/testData/ast/trait/extendsOneInterface.java b/j2k/tests/testData/fileOrElement/trait/extendsOneInterface.java similarity index 100% rename from j2k/tests/testData/ast/trait/extendsOneInterface.java rename to j2k/tests/testData/fileOrElement/trait/extendsOneInterface.java diff --git a/j2k/tests/testData/ast/trait/extendsOneInterface.kt b/j2k/tests/testData/fileOrElement/trait/extendsOneInterface.kt similarity index 100% rename from j2k/tests/testData/ast/trait/extendsOneInterface.kt rename to j2k/tests/testData/fileOrElement/trait/extendsOneInterface.kt diff --git a/j2k/tests/testData/ast/trait/interfaceWithFields.java b/j2k/tests/testData/fileOrElement/trait/interfaceWithFields.java similarity index 100% rename from j2k/tests/testData/ast/trait/interfaceWithFields.java rename to j2k/tests/testData/fileOrElement/trait/interfaceWithFields.java diff --git a/j2k/tests/testData/ast/trait/interfaceWithFields.kt b/j2k/tests/testData/fileOrElement/trait/interfaceWithFields.kt similarity index 100% rename from j2k/tests/testData/ast/trait/interfaceWithFields.kt rename to j2k/tests/testData/fileOrElement/trait/interfaceWithFields.kt diff --git a/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.java b/j2k/tests/testData/fileOrElement/trait/interfaceWithMethodDeclaration.java similarity index 100% rename from j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.java rename to j2k/tests/testData/fileOrElement/trait/interfaceWithMethodDeclaration.java diff --git a/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.kt b/j2k/tests/testData/fileOrElement/trait/interfaceWithMethodDeclaration.kt similarity index 100% rename from j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.kt rename to j2k/tests/testData/fileOrElement/trait/interfaceWithMethodDeclaration.kt diff --git a/j2k/tests/testData/ast/trait/interfaceWithStaticFields.java b/j2k/tests/testData/fileOrElement/trait/interfaceWithStaticFields.java similarity index 100% rename from j2k/tests/testData/ast/trait/interfaceWithStaticFields.java rename to j2k/tests/testData/fileOrElement/trait/interfaceWithStaticFields.java diff --git a/j2k/tests/testData/ast/trait/interfaceWithStaticFields.kt b/j2k/tests/testData/fileOrElement/trait/interfaceWithStaticFields.kt similarity index 100% rename from j2k/tests/testData/ast/trait/interfaceWithStaticFields.kt rename to j2k/tests/testData/fileOrElement/trait/interfaceWithStaticFields.kt diff --git a/j2k/tests/testData/ast/trait/internalInterface.java b/j2k/tests/testData/fileOrElement/trait/internalInterface.java similarity index 100% rename from j2k/tests/testData/ast/trait/internalInterface.java rename to j2k/tests/testData/fileOrElement/trait/internalInterface.java diff --git a/j2k/tests/testData/ast/trait/internalInterface.kt b/j2k/tests/testData/fileOrElement/trait/internalInterface.kt similarity index 100% rename from j2k/tests/testData/ast/trait/internalInterface.kt rename to j2k/tests/testData/fileOrElement/trait/internalInterface.kt diff --git a/j2k/tests/testData/ast/trait/privateInterface.java b/j2k/tests/testData/fileOrElement/trait/privateInterface.java similarity index 100% rename from j2k/tests/testData/ast/trait/privateInterface.java rename to j2k/tests/testData/fileOrElement/trait/privateInterface.java diff --git a/j2k/tests/testData/ast/trait/privateInterface.kt b/j2k/tests/testData/fileOrElement/trait/privateInterface.kt similarity index 100% rename from j2k/tests/testData/ast/trait/privateInterface.kt rename to j2k/tests/testData/fileOrElement/trait/privateInterface.kt diff --git a/j2k/tests/testData/ast/trait/protectedInterface.java b/j2k/tests/testData/fileOrElement/trait/protectedInterface.java similarity index 100% rename from j2k/tests/testData/ast/trait/protectedInterface.java rename to j2k/tests/testData/fileOrElement/trait/protectedInterface.java diff --git a/j2k/tests/testData/ast/trait/protectedInterface.kt b/j2k/tests/testData/fileOrElement/trait/protectedInterface.kt similarity index 100% rename from j2k/tests/testData/ast/trait/protectedInterface.kt rename to j2k/tests/testData/fileOrElement/trait/protectedInterface.kt diff --git a/j2k/tests/testData/ast/trait/publicInterface.java b/j2k/tests/testData/fileOrElement/trait/publicInterface.java similarity index 100% rename from j2k/tests/testData/ast/trait/publicInterface.java rename to j2k/tests/testData/fileOrElement/trait/publicInterface.java diff --git a/j2k/tests/testData/ast/trait/publicInterface.kt b/j2k/tests/testData/fileOrElement/trait/publicInterface.kt similarity index 100% rename from j2k/tests/testData/ast/trait/publicInterface.kt rename to j2k/tests/testData/fileOrElement/trait/publicInterface.kt diff --git a/j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.java b/j2k/tests/testData/fileOrElement/tryStatement/commonCaseForTryStatement.java similarity index 100% rename from j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.java rename to j2k/tests/testData/fileOrElement/tryStatement/commonCaseForTryStatement.java diff --git a/j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.kt b/j2k/tests/testData/fileOrElement/tryStatement/commonCaseForTryStatement.kt similarity index 100% rename from j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.kt rename to j2k/tests/testData/fileOrElement/tryStatement/commonCaseForTryStatement.kt diff --git a/j2k/tests/testData/ast/tryStatement/disjunctionType.java b/j2k/tests/testData/fileOrElement/tryStatement/disjunctionType.java similarity index 100% rename from j2k/tests/testData/ast/tryStatement/disjunctionType.java rename to j2k/tests/testData/fileOrElement/tryStatement/disjunctionType.java diff --git a/j2k/tests/testData/ast/tryStatement/disjunctionType.kt b/j2k/tests/testData/fileOrElement/tryStatement/disjunctionType.kt similarity index 100% rename from j2k/tests/testData/ast/tryStatement/disjunctionType.kt rename to j2k/tests/testData/fileOrElement/tryStatement/disjunctionType.kt diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.java b/j2k/tests/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.java similarity index 100% rename from j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.java rename to j2k/tests/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.java diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.kt b/j2k/tests/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.kt similarity index 100% rename from j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.kt rename to j2k/tests/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.kt diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.java b/j2k/tests/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithFinally.java similarity index 100% rename from j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.java rename to j2k/tests/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithFinally.java diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.kt b/j2k/tests/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithFinally.kt similarity index 100% rename from j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.kt rename to j2k/tests/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithFinally.kt diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.java b/j2k/tests/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithoutFinally.java similarity index 100% rename from j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.java rename to j2k/tests/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithoutFinally.java diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.kt b/j2k/tests/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithoutFinally.kt similarity index 100% rename from j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.kt rename to j2k/tests/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithoutFinally.kt diff --git a/j2k/tests/testData/ast/tryWithResource/Multiline.java b/j2k/tests/testData/fileOrElement/tryWithResource/Multiline.java similarity index 100% rename from j2k/tests/testData/ast/tryWithResource/Multiline.java rename to j2k/tests/testData/fileOrElement/tryWithResource/Multiline.java diff --git a/j2k/tests/testData/ast/tryWithResource/Multiline.kt b/j2k/tests/testData/fileOrElement/tryWithResource/Multiline.kt similarity index 100% rename from j2k/tests/testData/ast/tryWithResource/Multiline.kt rename to j2k/tests/testData/fileOrElement/tryWithResource/Multiline.kt diff --git a/j2k/tests/testData/ast/tryWithResource/MultipleResources.java b/j2k/tests/testData/fileOrElement/tryWithResource/MultipleResources.java similarity index 100% rename from j2k/tests/testData/ast/tryWithResource/MultipleResources.java rename to j2k/tests/testData/fileOrElement/tryWithResource/MultipleResources.java diff --git a/j2k/tests/testData/ast/tryWithResource/MultipleResources.kt b/j2k/tests/testData/fileOrElement/tryWithResource/MultipleResources.kt similarity index 100% rename from j2k/tests/testData/ast/tryWithResource/MultipleResources.kt rename to j2k/tests/testData/fileOrElement/tryWithResource/MultipleResources.kt diff --git a/j2k/tests/testData/ast/tryWithResource/Simple.java b/j2k/tests/testData/fileOrElement/tryWithResource/Simple.java similarity index 100% rename from j2k/tests/testData/ast/tryWithResource/Simple.java rename to j2k/tests/testData/fileOrElement/tryWithResource/Simple.java diff --git a/j2k/tests/testData/ast/tryWithResource/Simple.kt b/j2k/tests/testData/fileOrElement/tryWithResource/Simple.kt similarity index 100% rename from j2k/tests/testData/ast/tryWithResource/Simple.kt rename to j2k/tests/testData/fileOrElement/tryWithResource/Simple.kt diff --git a/j2k/tests/testData/ast/tryWithResource/WithCatch.java b/j2k/tests/testData/fileOrElement/tryWithResource/WithCatch.java similarity index 100% rename from j2k/tests/testData/ast/tryWithResource/WithCatch.java rename to j2k/tests/testData/fileOrElement/tryWithResource/WithCatch.java diff --git a/j2k/tests/testData/ast/tryWithResource/WithCatch.kt b/j2k/tests/testData/fileOrElement/tryWithResource/WithCatch.kt similarity index 100% rename from j2k/tests/testData/ast/tryWithResource/WithCatch.kt rename to j2k/tests/testData/fileOrElement/tryWithResource/WithCatch.kt diff --git a/j2k/tests/testData/ast/tryWithResource/WithCatchAndFinally.java b/j2k/tests/testData/fileOrElement/tryWithResource/WithCatchAndFinally.java similarity index 100% rename from j2k/tests/testData/ast/tryWithResource/WithCatchAndFinally.java rename to j2k/tests/testData/fileOrElement/tryWithResource/WithCatchAndFinally.java diff --git a/j2k/tests/testData/ast/tryWithResource/WithCatchAndFinally.kt b/j2k/tests/testData/fileOrElement/tryWithResource/WithCatchAndFinally.kt similarity index 100% rename from j2k/tests/testData/ast/tryWithResource/WithCatchAndFinally.kt rename to j2k/tests/testData/fileOrElement/tryWithResource/WithCatchAndFinally.kt diff --git a/j2k/tests/testData/ast/tryWithResource/WithCatches.java b/j2k/tests/testData/fileOrElement/tryWithResource/WithCatches.java similarity index 100% rename from j2k/tests/testData/ast/tryWithResource/WithCatches.java rename to j2k/tests/testData/fileOrElement/tryWithResource/WithCatches.java diff --git a/j2k/tests/testData/ast/tryWithResource/WithCatches.kt b/j2k/tests/testData/fileOrElement/tryWithResource/WithCatches.kt similarity index 100% rename from j2k/tests/testData/ast/tryWithResource/WithCatches.kt rename to j2k/tests/testData/fileOrElement/tryWithResource/WithCatches.kt diff --git a/j2k/tests/testData/ast/tryWithResource/WithFinally.java b/j2k/tests/testData/fileOrElement/tryWithResource/WithFinally.java similarity index 100% rename from j2k/tests/testData/ast/tryWithResource/WithFinally.java rename to j2k/tests/testData/fileOrElement/tryWithResource/WithFinally.java diff --git a/j2k/tests/testData/ast/tryWithResource/WithFinally.kt b/j2k/tests/testData/fileOrElement/tryWithResource/WithFinally.kt similarity index 100% rename from j2k/tests/testData/ast/tryWithResource/WithFinally.kt rename to j2k/tests/testData/fileOrElement/tryWithResource/WithFinally.kt diff --git a/j2k/tests/testData/ast/tryWithResource/WithReturnAtEnd.java b/j2k/tests/testData/fileOrElement/tryWithResource/WithReturnAtEnd.java similarity index 100% rename from j2k/tests/testData/ast/tryWithResource/WithReturnAtEnd.java rename to j2k/tests/testData/fileOrElement/tryWithResource/WithReturnAtEnd.java diff --git a/j2k/tests/testData/ast/tryWithResource/WithReturnAtEnd.kt b/j2k/tests/testData/fileOrElement/tryWithResource/WithReturnAtEnd.kt similarity index 100% rename from j2k/tests/testData/ast/tryWithResource/WithReturnAtEnd.kt rename to j2k/tests/testData/fileOrElement/tryWithResource/WithReturnAtEnd.kt diff --git a/j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass.java b/j2k/tests/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass.java similarity index 100% rename from j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass.java rename to j2k/tests/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass.java diff --git a/j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass.kt b/j2k/tests/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass.kt similarity index 100% rename from j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass.kt rename to j2k/tests/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass.kt diff --git a/j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass2.java b/j2k/tests/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass2.java similarity index 100% rename from j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass2.java rename to j2k/tests/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass2.java diff --git a/j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass2.kt b/j2k/tests/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass2.kt similarity index 100% rename from j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass2.kt rename to j2k/tests/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass2.kt diff --git a/j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass3.java.todo b/j2k/tests/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass3.java.todo similarity index 100% rename from j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass3.java.todo rename to j2k/tests/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass3.java.todo diff --git a/j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.java b/j2k/tests/testData/fileOrElement/typeCastExpression/extendsWildcardCast.java similarity index 100% rename from j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.java rename to j2k/tests/testData/fileOrElement/typeCastExpression/extendsWildcardCast.java diff --git a/j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.kt b/j2k/tests/testData/fileOrElement/typeCastExpression/extendsWildcardCast.kt similarity index 100% rename from j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.kt rename to j2k/tests/testData/fileOrElement/typeCastExpression/extendsWildcardCast.kt diff --git a/j2k/tests/testData/ast/typeCastExpression/fooCast.java b/j2k/tests/testData/fileOrElement/typeCastExpression/fooCast.java similarity index 100% rename from j2k/tests/testData/ast/typeCastExpression/fooCast.java rename to j2k/tests/testData/fileOrElement/typeCastExpression/fooCast.java diff --git a/j2k/tests/testData/ast/typeCastExpression/fooCast.kt b/j2k/tests/testData/fileOrElement/typeCastExpression/fooCast.kt similarity index 100% rename from j2k/tests/testData/ast/typeCastExpression/fooCast.kt rename to j2k/tests/testData/fileOrElement/typeCastExpression/fooCast.kt diff --git a/j2k/tests/testData/ast/typeCastExpression/intCast.java b/j2k/tests/testData/fileOrElement/typeCastExpression/intCast.java similarity index 100% rename from j2k/tests/testData/ast/typeCastExpression/intCast.java rename to j2k/tests/testData/fileOrElement/typeCastExpression/intCast.java diff --git a/j2k/tests/testData/ast/typeCastExpression/intCast.kt b/j2k/tests/testData/fileOrElement/typeCastExpression/intCast.kt similarity index 100% rename from j2k/tests/testData/ast/typeCastExpression/intCast.kt rename to j2k/tests/testData/fileOrElement/typeCastExpression/intCast.kt diff --git a/j2k/tests/testData/ast/typeCastExpression/primitiveType.java b/j2k/tests/testData/fileOrElement/typeCastExpression/primitiveType.java similarity index 100% rename from j2k/tests/testData/ast/typeCastExpression/primitiveType.java rename to j2k/tests/testData/fileOrElement/typeCastExpression/primitiveType.java diff --git a/j2k/tests/testData/ast/typeCastExpression/primitiveType.kt b/j2k/tests/testData/fileOrElement/typeCastExpression/primitiveType.kt similarity index 100% rename from j2k/tests/testData/ast/typeCastExpression/primitiveType.kt rename to j2k/tests/testData/fileOrElement/typeCastExpression/primitiveType.kt diff --git a/j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.java b/j2k/tests/testData/fileOrElement/typeCastExpression/simpleGenericCast.java similarity index 100% rename from j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.java rename to j2k/tests/testData/fileOrElement/typeCastExpression/simpleGenericCast.java diff --git a/j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.kt b/j2k/tests/testData/fileOrElement/typeCastExpression/simpleGenericCast.kt similarity index 100% rename from j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.kt rename to j2k/tests/testData/fileOrElement/typeCastExpression/simpleGenericCast.kt diff --git a/j2k/tests/testData/ast/typeCastExpression/stringCast.java b/j2k/tests/testData/fileOrElement/typeCastExpression/stringCast.java similarity index 100% rename from j2k/tests/testData/ast/typeCastExpression/stringCast.java rename to j2k/tests/testData/fileOrElement/typeCastExpression/stringCast.java diff --git a/j2k/tests/testData/ast/typeCastExpression/stringCast.kt b/j2k/tests/testData/fileOrElement/typeCastExpression/stringCast.kt similarity index 100% rename from j2k/tests/testData/ast/typeCastExpression/stringCast.kt rename to j2k/tests/testData/fileOrElement/typeCastExpression/stringCast.kt diff --git a/j2k/tests/testData/ast/typeCastExpression/superWildcardCast.java b/j2k/tests/testData/fileOrElement/typeCastExpression/superWildcardCast.java similarity index 100% rename from j2k/tests/testData/ast/typeCastExpression/superWildcardCast.java rename to j2k/tests/testData/fileOrElement/typeCastExpression/superWildcardCast.java diff --git a/j2k/tests/testData/ast/typeCastExpression/superWildcardCast.kt b/j2k/tests/testData/fileOrElement/typeCastExpression/superWildcardCast.kt similarity index 100% rename from j2k/tests/testData/ast/typeCastExpression/superWildcardCast.kt rename to j2k/tests/testData/fileOrElement/typeCastExpression/superWildcardCast.kt diff --git a/j2k/tests/testData/ast/typeCastExpression/wildcardCast.java b/j2k/tests/testData/fileOrElement/typeCastExpression/wildcardCast.java similarity index 100% rename from j2k/tests/testData/ast/typeCastExpression/wildcardCast.java rename to j2k/tests/testData/fileOrElement/typeCastExpression/wildcardCast.java diff --git a/j2k/tests/testData/ast/typeCastExpression/wildcardCast.kt b/j2k/tests/testData/fileOrElement/typeCastExpression/wildcardCast.kt similarity index 100% rename from j2k/tests/testData/ast/typeCastExpression/wildcardCast.kt rename to j2k/tests/testData/fileOrElement/typeCastExpression/wildcardCast.kt diff --git a/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.java b/j2k/tests/testData/fileOrElement/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.java similarity index 100% rename from j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.java rename to j2k/tests/testData/fileOrElement/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.java diff --git a/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt b/j2k/tests/testData/fileOrElement/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt similarity index 100% rename from j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt rename to j2k/tests/testData/fileOrElement/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt diff --git a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.java b/j2k/tests/testData/fileOrElement/typeParameters/classParametrizationWithTwoBounds.java similarity index 100% rename from j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.java rename to j2k/tests/testData/fileOrElement/typeParameters/classParametrizationWithTwoBounds.java diff --git a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.kt b/j2k/tests/testData/fileOrElement/typeParameters/classParametrizationWithTwoBounds.kt similarity index 100% rename from j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.kt rename to j2k/tests/testData/fileOrElement/typeParameters/classParametrizationWithTwoBounds.kt diff --git a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.java b/j2k/tests/testData/fileOrElement/typeParameters/classParametrizationWithTwoBoundsWithExtending.java similarity index 100% rename from j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.java rename to j2k/tests/testData/fileOrElement/typeParameters/classParametrizationWithTwoBoundsWithExtending.java diff --git a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt b/j2k/tests/testData/fileOrElement/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt similarity index 100% rename from j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt rename to j2k/tests/testData/fileOrElement/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt diff --git a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.java b/j2k/tests/testData/fileOrElement/typeParameters/complexExampleWithClassExtending.java similarity index 100% rename from j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.java rename to j2k/tests/testData/fileOrElement/typeParameters/complexExampleWithClassExtending.java diff --git a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.kt b/j2k/tests/testData/fileOrElement/typeParameters/complexExampleWithClassExtending.kt similarity index 100% rename from j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.kt rename to j2k/tests/testData/fileOrElement/typeParameters/complexExampleWithClassExtending.kt diff --git a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.java b/j2k/tests/testData/fileOrElement/typeParameters/complexExampleWithClassMultiplyExtending.java similarity index 100% rename from j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.java rename to j2k/tests/testData/fileOrElement/typeParameters/complexExampleWithClassMultiplyExtending.java diff --git a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.kt b/j2k/tests/testData/fileOrElement/typeParameters/complexExampleWithClassMultiplyExtending.kt similarity index 100% rename from j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.kt rename to j2k/tests/testData/fileOrElement/typeParameters/complexExampleWithClassMultiplyExtending.kt diff --git a/j2k/tests/testData/ast/typeParameters/genericClass.java b/j2k/tests/testData/fileOrElement/typeParameters/genericClass.java similarity index 100% rename from j2k/tests/testData/ast/typeParameters/genericClass.java rename to j2k/tests/testData/fileOrElement/typeParameters/genericClass.java diff --git a/j2k/tests/testData/ast/typeParameters/genericClass.kt b/j2k/tests/testData/fileOrElement/typeParameters/genericClass.kt similarity index 100% rename from j2k/tests/testData/ast/typeParameters/genericClass.kt rename to j2k/tests/testData/fileOrElement/typeParameters/genericClass.kt diff --git a/j2k/tests/testData/ast/typeParameters/genericParam-settings.java b/j2k/tests/testData/fileOrElement/typeParameters/genericParam-settings.java similarity index 100% rename from j2k/tests/testData/ast/typeParameters/genericParam-settings.java rename to j2k/tests/testData/fileOrElement/typeParameters/genericParam-settings.java diff --git a/j2k/tests/testData/ast/typeParameters/genericParam-settings.kt b/j2k/tests/testData/fileOrElement/typeParameters/genericParam-settings.kt similarity index 100% rename from j2k/tests/testData/ast/typeParameters/genericParam-settings.kt rename to j2k/tests/testData/fileOrElement/typeParameters/genericParam-settings.kt diff --git a/j2k/tests/testData/ast/typeParameters/genericParam.java b/j2k/tests/testData/fileOrElement/typeParameters/genericParam.java similarity index 100% rename from j2k/tests/testData/ast/typeParameters/genericParam.java rename to j2k/tests/testData/fileOrElement/typeParameters/genericParam.java diff --git a/j2k/tests/testData/ast/typeParameters/genericParam.kt b/j2k/tests/testData/fileOrElement/typeParameters/genericParam.kt similarity index 100% rename from j2k/tests/testData/ast/typeParameters/genericParam.kt rename to j2k/tests/testData/fileOrElement/typeParameters/genericParam.kt diff --git a/j2k/tests/testData/ast/typeParameters/manyGenericParams.java b/j2k/tests/testData/fileOrElement/typeParameters/manyGenericParams.java similarity index 100% rename from j2k/tests/testData/ast/typeParameters/manyGenericParams.java rename to j2k/tests/testData/fileOrElement/typeParameters/manyGenericParams.java diff --git a/j2k/tests/testData/ast/typeParameters/manyGenericParams.kt b/j2k/tests/testData/fileOrElement/typeParameters/manyGenericParams.kt similarity index 100% rename from j2k/tests/testData/ast/typeParameters/manyGenericParams.kt rename to j2k/tests/testData/fileOrElement/typeParameters/manyGenericParams.kt diff --git a/j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.java b/j2k/tests/testData/fileOrElement/typeParameters/methodDoubleParametrizationWithTwoBounds.java similarity index 100% rename from j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.java rename to j2k/tests/testData/fileOrElement/typeParameters/methodDoubleParametrizationWithTwoBounds.java diff --git a/j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.kt b/j2k/tests/testData/fileOrElement/typeParameters/methodDoubleParametrizationWithTwoBounds.kt similarity index 100% rename from j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.kt rename to j2k/tests/testData/fileOrElement/typeParameters/methodDoubleParametrizationWithTwoBounds.kt diff --git a/j2k/tests/testData/ast/typeParameters/needTypeArgs.java b/j2k/tests/testData/fileOrElement/typeParameters/needTypeArgs.java similarity index 100% rename from j2k/tests/testData/ast/typeParameters/needTypeArgs.java rename to j2k/tests/testData/fileOrElement/typeParameters/needTypeArgs.java diff --git a/j2k/tests/testData/ast/typeParameters/needTypeArgs.kt b/j2k/tests/testData/fileOrElement/typeParameters/needTypeArgs.kt similarity index 100% rename from j2k/tests/testData/ast/typeParameters/needTypeArgs.kt rename to j2k/tests/testData/fileOrElement/typeParameters/needTypeArgs.kt diff --git a/j2k/tests/testData/ast/typeParameters/rawTypeCast.java b/j2k/tests/testData/fileOrElement/typeParameters/rawTypeCast.java similarity index 100% rename from j2k/tests/testData/ast/typeParameters/rawTypeCast.java rename to j2k/tests/testData/fileOrElement/typeParameters/rawTypeCast.java diff --git a/j2k/tests/testData/ast/typeParameters/rawTypeCast.kt b/j2k/tests/testData/fileOrElement/typeParameters/rawTypeCast.kt similarity index 100% rename from j2k/tests/testData/ast/typeParameters/rawTypeCast.kt rename to j2k/tests/testData/fileOrElement/typeParameters/rawTypeCast.kt diff --git a/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.java b/j2k/tests/testData/fileOrElement/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.java similarity index 100% rename from j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.java rename to j2k/tests/testData/fileOrElement/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.java diff --git a/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt b/j2k/tests/testData/fileOrElement/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt similarity index 100% rename from j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt rename to j2k/tests/testData/fileOrElement/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt diff --git a/j2k/tests/testData/ast/typeParameters/typeFromOtherFile.java b/j2k/tests/testData/fileOrElement/typeParameters/typeFromOtherFile.java similarity index 100% rename from j2k/tests/testData/ast/typeParameters/typeFromOtherFile.java rename to j2k/tests/testData/fileOrElement/typeParameters/typeFromOtherFile.java diff --git a/j2k/tests/testData/ast/typeParameters/typeFromOtherFile.kt b/j2k/tests/testData/fileOrElement/typeParameters/typeFromOtherFile.kt similarity index 100% rename from j2k/tests/testData/ast/typeParameters/typeFromOtherFile.kt rename to j2k/tests/testData/fileOrElement/typeParameters/typeFromOtherFile.kt diff --git a/j2k/tests/testData/ast/typeParameters/where.java b/j2k/tests/testData/fileOrElement/typeParameters/where.java similarity index 100% rename from j2k/tests/testData/ast/typeParameters/where.java rename to j2k/tests/testData/fileOrElement/typeParameters/where.java diff --git a/j2k/tests/testData/ast/typeParameters/where.kt b/j2k/tests/testData/fileOrElement/typeParameters/where.kt similarity index 100% rename from j2k/tests/testData/ast/typeParameters/where.kt rename to j2k/tests/testData/fileOrElement/typeParameters/where.kt diff --git a/j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.java b/j2k/tests/testData/fileOrElement/varArg/ellipsisTypeSeveralParams.java similarity index 100% rename from j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.java rename to j2k/tests/testData/fileOrElement/varArg/ellipsisTypeSeveralParams.java diff --git a/j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.kt b/j2k/tests/testData/fileOrElement/varArg/ellipsisTypeSeveralParams.kt similarity index 100% rename from j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.kt rename to j2k/tests/testData/fileOrElement/varArg/ellipsisTypeSeveralParams.kt diff --git a/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.java b/j2k/tests/testData/fileOrElement/varArg/ellipsisTypeSingleParams.java similarity index 100% rename from j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.java rename to j2k/tests/testData/fileOrElement/varArg/ellipsisTypeSingleParams.java diff --git a/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.kt b/j2k/tests/testData/fileOrElement/varArg/ellipsisTypeSingleParams.kt similarity index 100% rename from j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.kt rename to j2k/tests/testData/fileOrElement/varArg/ellipsisTypeSingleParams.kt diff --git a/j2k/tests/testData/ast/whileStatement/whileWithBlock.java b/j2k/tests/testData/fileOrElement/whileStatement/whileWithBlock.java similarity index 100% rename from j2k/tests/testData/ast/whileStatement/whileWithBlock.java rename to j2k/tests/testData/fileOrElement/whileStatement/whileWithBlock.java diff --git a/j2k/tests/testData/ast/whileStatement/whileWithBlock.kt b/j2k/tests/testData/fileOrElement/whileStatement/whileWithBlock.kt similarity index 100% rename from j2k/tests/testData/ast/whileStatement/whileWithBlock.kt rename to j2k/tests/testData/fileOrElement/whileStatement/whileWithBlock.kt diff --git a/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.java b/j2k/tests/testData/fileOrElement/whileStatement/whileWithEmptyBlock.java similarity index 100% rename from j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.java rename to j2k/tests/testData/fileOrElement/whileStatement/whileWithEmptyBlock.java diff --git a/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.kt b/j2k/tests/testData/fileOrElement/whileStatement/whileWithEmptyBlock.kt similarity index 100% rename from j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.kt rename to j2k/tests/testData/fileOrElement/whileStatement/whileWithEmptyBlock.kt diff --git a/j2k/tests/testData/ast/whileStatement/whileWithExpression.java b/j2k/tests/testData/fileOrElement/whileStatement/whileWithExpression.java similarity index 100% rename from j2k/tests/testData/ast/whileStatement/whileWithExpression.java rename to j2k/tests/testData/fileOrElement/whileStatement/whileWithExpression.java diff --git a/j2k/tests/testData/ast/whileStatement/whileWithExpression.kt b/j2k/tests/testData/fileOrElement/whileStatement/whileWithExpression.kt similarity index 100% rename from j2k/tests/testData/ast/whileStatement/whileWithExpression.kt rename to j2k/tests/testData/fileOrElement/whileStatement/whileWithExpression.kt diff --git a/j2k/tests/testData/ast/whileStatement/whileWithReturn.java b/j2k/tests/testData/fileOrElement/whileStatement/whileWithReturn.java similarity index 100% rename from j2k/tests/testData/ast/whileStatement/whileWithReturn.java rename to j2k/tests/testData/fileOrElement/whileStatement/whileWithReturn.java diff --git a/j2k/tests/testData/ast/whileStatement/whileWithReturn.kt b/j2k/tests/testData/fileOrElement/whileStatement/whileWithReturn.kt similarity index 100% rename from j2k/tests/testData/ast/whileStatement/whileWithReturn.kt rename to j2k/tests/testData/fileOrElement/whileStatement/whileWithReturn.kt diff --git a/j2k/tests/testData/multiFile/GetterAndSetterUsages/1.java b/j2k/tests/testData/multiFile/GetterAndSetterUsages/1.java new file mode 100644 index 00000000000..2911fe3791f --- /dev/null +++ b/j2k/tests/testData/multiFile/GetterAndSetterUsages/1.java @@ -0,0 +1,19 @@ +public class AAA { + private int x = 42; + + public int getX() { + return x; + } + + public void setX(int x) { + this.x = x; + } + + public void foo() { + setX(getX() + 1); + } + + public void bar(B b) { + System.out.println(b.getYY()); + } +} diff --git a/j2k/tests/testData/multiFile/GetterAndSetterUsages/1.kt b/j2k/tests/testData/multiFile/GetterAndSetterUsages/1.kt new file mode 100644 index 00000000000..e0b8ca34b65 --- /dev/null +++ b/j2k/tests/testData/multiFile/GetterAndSetterUsages/1.kt @@ -0,0 +1,11 @@ +public class AAA { + public var x: Int = 42 + + public fun foo() { + x = x + 1 + } + + public fun bar(b: B) { + System.out.println(b.YY) + } +} \ No newline at end of file diff --git a/j2k/tests/testData/multiFile/GetterAndSetterUsages/2.java b/j2k/tests/testData/multiFile/GetterAndSetterUsages/2.java new file mode 100644 index 00000000000..8af80787c14 --- /dev/null +++ b/j2k/tests/testData/multiFile/GetterAndSetterUsages/2.java @@ -0,0 +1,12 @@ +class B { + void foo(AAA a) { + a.setX(a.getX() + 1); + y += "a"; + } + + private String y = ""; + + public String getYY() { + return y; + } +} diff --git a/j2k/tests/testData/multiFile/GetterAndSetterUsages/2.kt b/j2k/tests/testData/multiFile/GetterAndSetterUsages/2.kt new file mode 100644 index 00000000000..e51980f694a --- /dev/null +++ b/j2k/tests/testData/multiFile/GetterAndSetterUsages/2.kt @@ -0,0 +1,9 @@ +class B { + fun foo(a: AAA) { + a.x = a.x + 1 + YY += "a" + } + + public var YY: String = "" + private set +} \ No newline at end of file