From 433405c4e15e6ac4198512ac5e354cbb5eac968b Mon Sep 17 00:00:00 2001 From: Sergey Ignatov Date: Fri, 4 Nov 2011 20:16:37 +0400 Subject: [PATCH] now we read tests files from directories --- ...se.java => JavaToKotlinConverterTest.java} | 180 ++++++++---------- .../jetbrains/jet/j2k/TestCaseBuilder.java | 91 +++++++++ .../j2k/ast/ArrayAccessExpressionTest.java | 21 -- .../ast/ArrayInitializerExpressionTest.java | 45 ----- .../jetbrains/jet/j2k/ast/ArrayTypeTest.java | 65 ------- .../jet/j2k/ast/AssertStatementTest.java | 30 --- .../jet/j2k/ast/AssignmentExpressionTest.java | 61 ------ .../jet/j2k/ast/BinaryExpressionTest.java | 81 -------- .../jetbrains/jet/j2k/ast/BoxedTypeTest.java | 52 ----- .../jet/j2k/ast/BreakStatementTest.java | 23 --- test/org/jetbrains/jet/j2k/ast/ClassTest.java | 152 --------------- .../j2k/ast/ConditionalExpressionTest.java | 19 -- .../jet/j2k/ast/ContinueStatementTest.java | 23 --- .../jet/j2k/ast/DeclarationStatementTest.java | 55 ------ .../jet/j2k/ast/DoWhileStatementTest.java | 45 ----- test/org/jetbrains/jet/j2k/ast/EnumTest.java | 159 ---------------- test/org/jetbrains/jet/j2k/ast/FieldTest.java | 46 ----- test/org/jetbrains/jet/j2k/ast/FileTest.java | 68 ------- test/org/jetbrains/jet/j2k/ast/ForTest.java | 115 ----------- .../jet/j2k/ast/ForeachStatementTest.java | 41 ---- .../jetbrains/jet/j2k/ast/FunctionTest.java | 87 --------- .../jet/j2k/ast/IdentifierImplTest.java | 11 -- .../jet/j2k/ast/IfStatementTest.java | 57 ------ .../jet/j2k/ast/InProjectionTypeTest.java | 16 -- .../jetbrains/jet/j2k/ast/IsOperatorTest.java | 23 --- .../jet/j2k/ast/LabelStatementTest.java | 58 ------ .../jet/j2k/ast/LocalVariableTest.java | 16 -- .../jet/j2k/ast/MethodCallExpressionTest.java | 27 --- .../jet/j2k/ast/NewClassExpressionTest.java | 25 --- .../jet/j2k/ast/OutProjectionTypeTest.java | 16 -- .../j2k/ast/ParenthesizedExpressionTest.java | 17 -- .../jet/j2k/ast/PolyadicExpressionTest.java | 29 --- .../jet/j2k/ast/PostfixOperatorTest.java | 17 -- .../jet/j2k/ast/PrefixOperatorTest.java | 17 -- .../jet/j2k/ast/ReturnStatementTest.java | 37 ---- .../jet/j2k/ast/StarProjectionTypeTest.java | 16 -- .../j2k/ast/SynchronizedStatementTest.java | 16 -- .../jet/j2k/ast/ThrowStatementTest.java | 14 -- test/org/jetbrains/jet/j2k/ast/TraitTest.java | 95 --------- .../jet/j2k/ast/TryStatementTest.java | 111 ----------- .../jet/j2k/ast/TypeCastExpressionTest.java | 65 ------- .../jet/j2k/ast/TypeParametersTest.java | 91 --------- .../org/jetbrains/jet/j2k/ast/VarArgTest.java | 23 --- .../jet/j2k/ast/WhileStatementTest.java | 41 ---- .../expression/expressionIndex.jav | 1 + .../expression/expressionIndex.kt | 1 + .../expression/intIndex.jav | 1 + .../expression/intIndex.kt | 1 + .../expression/variableIndex.jav | 1 + .../expression/variableIndex.kt | 1 + .../expression/newInt.jav | 1 + .../expression/newInt.kt | 1 + .../expression/oneDim.jav | 1 + .../expression/oneDim.kt | 1 + .../expression/oneDimWithVariables.jav | 1 + .../expression/oneDimWithVariables.kt | 1 + .../expression/twoDim.jav | 1 + .../expression/twoDim.kt | 1 + testData/arrayType/method/methodArrayArgs.jav | 1 + testData/arrayType/method/methodArrayArgs.kt | 1 + .../arrayInitializationStatement.jav | 1 + .../statement/arrayInitializationStatement.kt | 1 + ...ayInitializationStatementWithDimension.jav | 1 + ...rayInitializationStatementWithDimension.kt | 1 + .../arrayType/statement_mult/doubleArray.jav | 1 + .../arrayType/statement_mult/doubleArray.kt | 1 + .../arrayType/statement_mult/longArray.jav | 1 + .../arrayType/statement_mult/longArray.kt | 1 + .../arrayType/statement_mult/newIntArray.jav | 1 + .../arrayType/statement_mult/newIntArray.kt | 1 + .../statement_mult/newStringArray.jav | 1 + .../statement_mult/newStringArray.kt | 1 + .../statement_mult/onlyCondition.jav | 1 + .../statement_mult/onlyCondition.kt | 1 + .../onlyConditionWithBraces.jav | 1 + .../statement_mult/onlyConditionWithBraces.kt | 1 + .../statement_mult/withStringDetail.jav | 1 + .../statement_mult/withStringDetail.kt | 1 + .../expression_mult/and.jav | 1 + .../expression_mult/and.kt | 1 + .../expression_mult/assignment.jav | 1 + .../expression_mult/assignment.kt | 1 + .../expression_mult/divideAssign.jav | 1 + .../expression_mult/divideAssign.kt | 1 + .../expression_mult/minusAssign.jav | 1 + .../expression_mult/minusAssign.kt | 1 + .../expression_mult/multiplyAssign.jav | 1 + .../expression_mult/multiplyAssign.kt | 1 + .../expression_mult/or.jav | 1 + .../expression_mult/or.kt | 1 + .../expression_mult/plusAssign.jav | 1 + .../expression_mult/plusAssign.kt | 1 + .../expression_mult/reminder.jav | 1 + .../expression_mult/reminder.kt | 1 + .../expression_mult/shiftLeft.jav | 1 + .../expression_mult/shiftLeft.kt | 1 + .../expression_mult/shiftRight.jav | 1 + .../expression_mult/shiftRight.kt | 1 + .../expression_mult/unsignedRightShift.jav | 1 + .../expression_mult/unsignedRightShift.kt | 1 + .../expression_mult/xor.jav | 1 + .../expression_mult/xor.kt | 1 + .../statement/simpleAssignment.jav | 1 + .../statement/simpleAssignment.kt | 1 + .../binaryExpression/expression_mult/and.jav | 1 + .../binaryExpression/expression_mult/and.kt | 1 + .../expression_mult/conditionalAnd.jav | 1 + .../expression_mult/conditionalAnd.kt | 1 + .../expression_mult/conditionalOr.jav | 1 + .../expression_mult/conditionalOr.kt | 1 + .../expression_mult/divide.jav | 1 + .../expression_mult/divide.kt | 1 + .../expression_mult/greaterThan.jav | 1 + .../expression_mult/greaterThan.kt | 1 + .../expression_mult/greaterThanEqual.jav | 1 + .../expression_mult/greaterThanEqual.kt | 1 + .../expression_mult/lessThan.jav | 1 + .../expression_mult/lessThan.kt | 1 + .../expression_mult/lessThanEqual.jav | 1 + .../expression_mult/lessThanEqual.kt | 1 + .../expression_mult/minus.jav | 1 + .../binaryExpression/expression_mult/minus.kt | 1 + .../expression_mult/multiply.jav | 1 + .../expression_mult/multiply.kt | 1 + .../binaryExpression/expression_mult/or.jav | 1 + .../binaryExpression/expression_mult/or.kt | 1 + .../binaryExpression/expression_mult/plus.jav | 1 + .../binaryExpression/expression_mult/plus.kt | 1 + .../expression_mult/remainder.jav | 1 + .../expression_mult/remainder.kt | 1 + .../expression_mult/shiftLeft.jav | 1 + .../expression_mult/shiftLeft.kt | 1 + .../expression_mult/shiftRight.jav | 1 + .../expression_mult/shiftRight.kt | 1 + .../expression_mult/unsignedRightShift.jav | 1 + .../expression_mult/unsignedRightShift.kt | 1 + .../binaryExpression/expression_mult/xor.jav | 1 + .../binaryExpression/expression_mult/xor.kt | 1 + testData/boxedType/statement_mult/boolean.jav | 1 + testData/boxedType/statement_mult/boolean.kt | 1 + testData/boxedType/statement_mult/byte.jav | 1 + testData/boxedType/statement_mult/byte.kt | 1 + .../boxedType/statement_mult/character.jav | 1 + .../boxedType/statement_mult/character.kt | 1 + testData/boxedType/statement_mult/double.jav | 1 + testData/boxedType/statement_mult/double.kt | 1 + testData/boxedType/statement_mult/float.jav | 1 + testData/boxedType/statement_mult/float.kt | 1 + testData/boxedType/statement_mult/integer.jav | 1 + testData/boxedType/statement_mult/integer.kt | 1 + testData/boxedType/statement_mult/long.jav | 1 + testData/boxedType/statement_mult/long.kt | 1 + testData/boxedType/statement_mult/object.jav | 1 + testData/boxedType/statement_mult/object.kt | 1 + testData/boxedType/statement_mult/short.jav | 1 + testData/boxedType/statement_mult/short.kt | 1 + .../statement/breakWithLabel.jav | 1 + .../statement/breakWithLabel.kt | 1 + .../statement/breakWithoutLabel.jav | 1 + .../statement/breakWithoutLabel.kt | 1 + testData/class_/class/class.jav | 1 + testData/class_/class/class.kt | 1 + testData/class_/class/emptyClass.jav | 1 + testData/class_/class/emptyClass.kt | 1 + ...tendsOneClassAndImplementsOneInterface.jav | 1 + ...xtendsOneClassAndImplementsOneInterface.kt | 1 + ...OneClassAndImplementsSeveralInterfaces.jav | 1 + ...sOneClassAndImplementsSeveralInterfaces.kt | 1 + testData/class_/class/finalClass.jav | 1 + testData/class_/class/finalClass.kt | 1 + testData/class_/class/genericClass.jav | 1 + testData/class_/class/genericClass.kt | 1 + testData/class_/class/innerEmptyClass.jav | 1 + testData/class_/class/innerEmptyClass.kt | 1 + testData/class_/class/innerStaticClass.jav | 1 + testData/class_/class/innerStaticClass.kt | 1 + testData/class_/class/internalClass.jav | 1 + testData/class_/class/internalClass.kt | 1 + .../class/oneStaticFieldOneNonStatic.jav | 1 + .../class/oneStaticFieldOneNonStatic.kt | 1 + testData/class_/class/oneStaticMethod.jav | 1 + testData/class_/class/oneStaticMethod.kt | 1 + .../class/oneStaticMethodOneNonStatic.jav | 1 + .../class/oneStaticMethodOneNonStatic.kt | 1 + testData/class_/class/pivateClass.jav | 1 + testData/class_/class/pivateClass.kt | 1 + testData/class_/class/protectedClass.jav | 1 + testData/class_/class/protectedClass.kt | 1 + testData/class_/class/publicClass.jav | 1 + testData/class_/class/publicClass.kt | 1 + testData/class_/class/simpleInheritance.jav | 1 + testData/class_/class/simpleInheritance.kt | 1 + testData/class_/class/twoStaticMethod.jav | 1 + testData/class_/class/twoStaticMethod.kt | 1 + .../class_mult/classWithEmptyMethods.jav | 1 + .../class_mult/classWithEmptyMethods.kt | 8 + .../class_/class_mult/classWithFields.jav | 1 + testData/class_/class_mult/classWithFields.kt | 4 + .../class_mult/classWithMultiplyFields.jav | 1 + .../class_mult/classWithMultiplyFields.kt | 5 + .../simpleConditionalExpression.jav | 1 + .../simpleConditionalExpression.kt | 4 + .../statement/continueWithLabel.jav | 1 + .../statement/continueWithLabel.kt | 1 + .../statement/continueWithoutLabel.jav | 1 + .../statement/continueWithoutLabel.kt | 1 + .../statement/singleFinalIntDeclaration.jav | 1 + .../statement/singleFinalIntDeclaration.kt | 1 + .../singleFinalStringDeclaration.jav | 1 + .../statement/singleFinalStringDeclaration.kt | 1 + .../statement/singleIntDeclaration.jav | 1 + .../statement/singleIntDeclaration.kt | 1 + .../statement/singleStringDeclaration.jav | 1 + .../statement/singleStringDeclaration.kt | 1 + .../multiplyFinalIntDeclaration.jav | 1 + .../multiplyFinalIntDeclaration.kt | 3 + .../statement_mult/multiplyIntDeclaration.jav | 1 + .../statement_mult/multiplyIntDeclaration.kt | 3 + .../statement_mult/whileWithBlock.jav | 1 + .../statement_mult/whileWithBlock.kt | 6 + .../statement_mult/whileWithEmptyBlock.jav | 1 + .../statement_mult/whileWithEmptyBlock.kt | 4 + .../statement_mult/whileWithExpression.jav | 1 + .../statement_mult/whileWithExpression.kt | 3 + .../statement_mult/whileWithReturn.jav | 1 + .../statement_mult/whileWithReturn.kt | 3 + testData/enum/class/emptyEnum.jav | 1 + testData/enum/class/emptyEnum.kt | 1 + .../enum/class/enumImplementsOneInterface.jav | 1 + .../enum/class/enumImplementsOneInterface.kt | 1 + .../class/enumImplementsSeveralInterfaces.jav | 1 + .../class/enumImplementsSeveralInterfaces.kt | 1 + testData/enum/class/internalEnum.jav | 1 + testData/enum/class/internalEnum.kt | 1 + testData/enum/class/privateEnum.jav | 1 + testData/enum/class/privateEnum.kt | 1 + testData/enum/class/protectedEnum.jav | 1 + testData/enum/class/protectedEnum.kt | 1 + testData/enum/class/publicEnum.jav | 1 + testData/enum/class/publicEnum.kt | 1 + .../enum/class_mult/enumWithNameField.jav | 1 + testData/enum/class_mult/enumWithNameField.kt | 4 + .../fieldsWithPrimaryPrivateConstructor.jav | 12 ++ .../fieldsWithPrimaryPrivateConstructor.kt | 14 ++ testData/enum/class_mult/overrideToString.jav | 1 + testData/enum/class_mult/overrideToString.kt | 10 + .../class_mult/runnableImplementation.jav | 8 + .../enum/class_mult/runnableImplementation.kt | 10 + testData/enum/class_mult/typeSafeEnum.jav | 1 + testData/enum/class_mult/typeSafeEnum.kt | 6 + testData/field/method/internalField.jav | 1 + testData/field/method/internalField.kt | 1 + testData/field/method/privateField.jav | 1 + testData/field/method/privateField.kt | 1 + testData/field/method/protectedField.jav | 1 + testData/field/method/protectedField.kt | 1 + testData/field/method/publicField.jav | 1 + testData/field/method/publicField.kt | 1 + testData/field/method/valWithInit.jav | 1 + testData/field/method/valWithInit.kt | 1 + testData/field/method/varWithInit.jav | 1 + testData/field/method/varWithInit.kt | 1 + testData/field/method/varWithoutInit.jav | 1 + testData/field/method/varWithoutInit.kt | 1 + testData/file_/file/packageWithClass.jav | 1 + testData/file_/file/packageWithClass.kt | 1 + testData/file_/file/packageWithClasses.jav | 1 + testData/file_/file/packageWithClasses.kt | 1 + testData/file_/file/packageWithOpenClass.jav | 1 + testData/file_/file/packageWithOpenClass.kt | 1 + .../file_/file_mult/packageWithImports.jav | 1 + .../file_/file_mult/packageWithImports.kt | 4 + .../file_mult/packageWithMixedImports.jav | 1 + .../file_mult/packageWithMixedImports.kt | 4 + .../file_mult/packageWithStaticImports.jav | 1 + .../file_mult/packageWithStaticImports.kt | 4 + .../for/statement_mult/commonCaseForTest.jav | 1 + .../for/statement_mult/commonCaseForTest.kt | 10 + testData/for/statement_mult/forWithBlock.jav | 1 + testData/for/statement_mult/forWithBlock.kt | 13 ++ .../forWithBlockAndDoubleUpdate.jav | 1 + .../forWithBlockAndDoubleUpdate.kt | 14 ++ .../for/statement_mult/forWithEmptyBlock.jav | 1 + .../for/statement_mult/forWithEmptyBlock.kt | 12 ++ .../for/statement_mult/forWithExpression.jav | 1 + .../for/statement_mult/forWithExpression.kt | 10 + testData/for/statement_mult/forWithReturn.jav | 1 + testData/for/statement_mult/forWithReturn.kt | 11 ++ .../statement_mult/enhancedForWithBlock.jav | 1 + .../statement_mult/enhancedForWithBlock.kt | 5 + .../enhancedForWithEmptyBlock.jav | 1 + .../enhancedForWithEmptyBlock.kt | 3 + .../enhancedForWithExpression.jav | 1 + .../enhancedForWithExpression.kt | 2 + .../statement_mult/enhancedForWithReturn.jav | 1 + .../statement_mult/enhancedForWithReturn.kt | 2 + testData/function/file/override.jav | 1 + testData/function/file/override.kt | 1 + .../function/method/classGenericParam.jav | 1 + testData/function/method/classGenericParam.kt | 1 + testData/function/method/emptyVoidMethod.jav | 1 + testData/function/method/emptyVoidMethod.kt | 1 + testData/function/method/internal.jav | 1 + testData/function/method/internal.kt | 1 + testData/function/method/methodClassType.jav | 1 + testData/function/method/methodClassType.kt | 1 + .../function/method/methodPrimitiveType.jav | 1 + .../function/method/methodPrimitiveType.kt | 1 + .../function/method/methodPrimitiveType2.jav | 1 + .../function/method/methodPrimitiveType2.kt | 1 + .../method/methodWithReturnStatement.jav | 1 + .../method/methodWithReturnStatement.kt | 1 + testData/function/method/ownGenericParam.jav | 1 + testData/function/method/ownGenericParam.kt | 1 + .../method/ownSeveralGenericParams.jav | 1 + .../method/ownSeveralGenericParams.kt | 1 + testData/function/method/private.jav | 1 + testData/function/method/private.kt | 1 + testData/function/method/protected.jav | 1 + testData/function/method/protected.kt | 1 + testData/function/method/public.jav | 1 + testData/function/method/public.kt | 1 + .../ifStatementWithEmptyBlocks.jav | 1 + .../ifStatementWithEmptyBlocks.kt | 6 + .../ifStatementWithMultilineBlocks.jav | 1 + .../ifStatementWithMultilineBlocks.kt | 9 + .../ifStatementWithOneLineBlocks.jav | 1 + .../ifStatementWithOneLineBlocks.kt | 4 + .../statement_mult/ifStatementWithoutElse.jav | 1 + .../statement_mult/ifStatementWithoutElse.kt | 5 + .../inProjectionType/method/methodParams.jav | 1 + .../inProjectionType/method/methodParams.kt | 1 + .../expression_mult/complicatedExpression.jav | 1 + .../expression_mult/complicatedExpression.kt | 1 + .../expression_mult/simpleReference.jav | 1 + .../expression_mult/simpleReference.kt | 1 + .../complicatedExampleFromJavaTutorial.jav | 1 + .../complicatedExampleFromJavaTutorial.kt | 27 +++ testData/localVariable/statement/object.jav | 1 + testData/localVariable/statement/object.kt | 1 + .../statement/callWithKeywords.jav | 1 + .../statement/callWithKeywords.kt | 1 + .../statement/emptyCall.jav | 1 + .../statement/emptyCall.kt | 1 + .../statement/simpleCall.jav | 1 + .../statement/simpleCall.kt | 1 + .../expression/classWithParam.jav | 1 + .../expression/classWithParam.kt | 1 + .../expression/classWithParams.jav | 1 + .../expression/classWithParams.kt | 1 + .../expression/classWithoutBody.jav | 1 + .../expression/classWithoutBody.kt | 1 + .../expression/classWithoutBody2.jav | 1 + .../expression/classWithoutBody2.kt | 1 + .../outProjectionType/method/methodParams.jav | 1 + .../outProjectionType/method/methodParams.kt | 1 + .../expression/parenthesized.jav | 1 + .../expression/parenthesized.kt | 1 + .../expression/parenthesized2.jav | 1 + .../expression/parenthesized2.kt | 1 + .../expression_mult/divide.jav | 1 + .../expression_mult/divide.kt | 1 + .../expression_mult/minus.jav | 1 + .../expression_mult/minus.kt | 1 + .../expression_mult/multiply.jav | 1 + .../expression_mult/multiply.kt | 1 + .../expression_mult/plus.jav | 1 + .../expression_mult/plus.kt | 1 + .../expression_mult/remainder.jav | 1 + .../expression_mult/remainder.kt | 1 + .../statement_mult/decrement.jav | 1 + .../statement_mult/decrement.kt | 1 + .../statement_mult/increment.jav | 1 + .../statement_mult/increment.kt | 1 + .../statement_mult/decrement.jav | 1 + .../statement_mult/decrement.kt | 1 + .../statement_mult/increment.jav | 1 + .../statement_mult/increment.kt | 1 + .../returnStatement/statement/returnChar.jav | 1 + .../returnStatement/statement/returnChar.kt | 1 + .../statement/returnLiteral.jav | 1 + .../statement/returnLiteral.kt | 1 + .../statement/returnNumber.jav | 1 + .../returnStatement/statement/returnNumber.kt | 1 + .../statement/returnString.jav | 1 + .../returnStatement/statement/returnString.kt | 1 + .../method/methodParams.jav | 1 + .../starProjectionType/method/methodParams.kt | 1 + .../statement/singleLineExample.jav | 1 + .../statement/singleLineExample.kt | 1 + .../statement/simpleThrowStatement.jav | 1 + .../statement/simpleThrowStatement.kt | 1 + testData/trait/class/emptyInterface.jav | 1 + testData/trait/class/emptyInterface.kt | 1 + ...OneClassAndImplementsSeveralInterfaces.jav | 1 + ...sOneClassAndImplementsSeveralInterfaces.kt | 1 + testData/trait/class/extendsOneInterface.jav | 1 + testData/trait/class/extendsOneInterface.kt | 1 + testData/trait/class/internalInterface.jav | 1 + testData/trait/class/internalInterface.kt | 1 + testData/trait/class/privateInterface.jav | 1 + testData/trait/class/privateInterface.kt | 1 + testData/trait/class/protectedInterface.jav | 1 + testData/trait/class/protectedInterface.kt | 1 + testData/trait/class/publicInterface.jav | 1 + testData/trait/class/publicInterface.kt | 1 + .../trait/class_mult/interfaceWithFields.jav | 1 + .../trait/class_mult/interfaceWithFields.kt | 7 + .../interfaceWithMethodDeclaration.jav | 1 + .../interfaceWithMethodDeclaration.kt | 4 + .../class_mult/interfaceWithStaticFields.jav | 1 + .../class_mult/interfaceWithStaticFields.kt | 7 + .../commonCaseForTryStatement.jav | 1 + .../commonCaseForTryStatement.kt | 14 ++ ...emptyTryWithTwoCatchesWithEmptyFinally.jav | 1 + .../emptyTryWithTwoCatchesWithEmptyFinally.kt | 12 ++ .../emptyTryWithTwoCatchesWithFinally.jav | 1 + .../emptyTryWithTwoCatchesWithFinally.kt | 13 ++ .../emptyTryWithTwoCatchesWithoutFinally.jav | 1 + .../emptyTryWithTwoCatchesWithoutFinally.kt | 9 + .../expression_mult/extendsWildcardCast.jav | 1 + .../expression_mult/extendsWildcardCast.kt | 1 + .../expression_mult/fooCast.jav | 1 + .../expression_mult/fooCast.kt | 1 + .../expression_mult/intCast.jav | 1 + .../expression_mult/intCast.kt | 1 + .../expression_mult/primitiveType.jav | 1 + .../expression_mult/primitiveType.kt | 1 + .../expression_mult/simpleGenericCast.jav | 1 + .../expression_mult/simpleGenericCast.kt | 1 + .../expression_mult/stringCast.jav | 1 + .../expression_mult/stringCast.kt | 1 + .../expression_mult/superWildcardCast.jav | 1 + .../expression_mult/superWildcardCast.kt | 1 + .../expression_mult/wildcardCast.jav | 1 + .../expression_mult/wildcardCast.kt | 1 + ...ametrizationWithTwoBoundsWithExtending.jav | 1 + ...rametrizationWithTwoBoundsWithExtending.kt | 1 + .../classParametrizationWithTwoBounds.jav | 1 + .../classParametrizationWithTwoBounds.kt | 1 + ...ametrizationWithTwoBoundsWithExtending.jav | 1 + ...rametrizationWithTwoBoundsWithExtending.kt | 1 + .../complexExampleWithClassExtending.jav | 1 + .../class/complexExampleWithClassExtending.kt | 1 + ...mplexExampleWithClassMultiplyExtending.jav | 1 + ...omplexExampleWithClassMultiplyExtending.kt | 1 + .../typeParameters/class/genericClass.jav | 1 + testData/typeParameters/class/genericClass.kt | 1 + ...ametrizationWithTwoBoundsWithExtending.jav | 1 + ...rametrizationWithTwoBoundsWithExtending.kt | 1 + ...thodDoubleParametrizationWithTwoBounds.jav | 1 + ...ethodDoubleParametrizationWithTwoBounds.kt | 1 + testData/typeParameters/method/where.jav | 1 + testData/typeParameters/method/where.kt | 1 + .../statement_mult/genericParam.jav | 1 + .../statement_mult/genericParam.kt | 1 + .../statement_mult/manyGenericParams.jav | 1 + .../statement_mult/manyGenericParams.kt | 1 + .../method/ellipsisTypeSeveralParams.jav | 1 + .../method/ellipsisTypeSeveralParams.kt | 1 + .../method/ellipsisTypeSingleParams.jav | 1 + .../varArg/method/ellipsisTypeSingleParams.kt | 1 + .../statement_mult/whileWithBlock.jav | 1 + .../statement_mult/whileWithBlock.kt | 5 + .../statement_mult/whileWithEmptyBlock.jav | 1 + .../statement_mult/whileWithEmptyBlock.kt | 3 + .../statement_mult/whileWithExpression.jav | 1 + .../statement_mult/whileWithExpression.kt | 2 + .../statement_mult/whileWithReturn.jav | 1 + .../statement_mult/whileWithReturn.kt | 2 + 470 files changed, 883 insertions(+), 2124 deletions(-) rename test/org/jetbrains/jet/j2k/{JetTestCaseBase.java => JavaToKotlinConverterTest.java} (53%) create mode 100644 test/org/jetbrains/jet/j2k/TestCaseBuilder.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/ArrayAccessExpressionTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/ArrayInitializerExpressionTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/ArrayTypeTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/AssertStatementTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/AssignmentExpressionTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/BinaryExpressionTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/BoxedTypeTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/BreakStatementTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/ClassTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/ConditionalExpressionTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/ContinueStatementTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/DeclarationStatementTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/DoWhileStatementTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/EnumTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/FieldTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/FileTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/ForTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/ForeachStatementTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/FunctionTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/IdentifierImplTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/IfStatementTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/InProjectionTypeTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/IsOperatorTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/LabelStatementTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/LocalVariableTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/MethodCallExpressionTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/NewClassExpressionTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/OutProjectionTypeTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/ParenthesizedExpressionTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/PolyadicExpressionTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/PostfixOperatorTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/PrefixOperatorTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/ReturnStatementTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/StarProjectionTypeTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/SynchronizedStatementTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/ThrowStatementTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/TraitTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/TryStatementTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/TypeCastExpressionTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/TypeParametersTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/VarArgTest.java delete mode 100644 test/org/jetbrains/jet/j2k/ast/WhileStatementTest.java create mode 100644 testData/arrayAccessExpression/expression/expressionIndex.jav create mode 100644 testData/arrayAccessExpression/expression/expressionIndex.kt create mode 100644 testData/arrayAccessExpression/expression/intIndex.jav create mode 100644 testData/arrayAccessExpression/expression/intIndex.kt create mode 100644 testData/arrayAccessExpression/expression/variableIndex.jav create mode 100644 testData/arrayAccessExpression/expression/variableIndex.kt create mode 100644 testData/arrayInitializerExpression/expression/newInt.jav create mode 100644 testData/arrayInitializerExpression/expression/newInt.kt create mode 100644 testData/arrayInitializerExpression/expression/oneDim.jav create mode 100644 testData/arrayInitializerExpression/expression/oneDim.kt create mode 100644 testData/arrayInitializerExpression/expression/oneDimWithVariables.jav create mode 100644 testData/arrayInitializerExpression/expression/oneDimWithVariables.kt create mode 100644 testData/arrayInitializerExpression/expression/twoDim.jav create mode 100644 testData/arrayInitializerExpression/expression/twoDim.kt create mode 100644 testData/arrayType/method/methodArrayArgs.jav create mode 100644 testData/arrayType/method/methodArrayArgs.kt create mode 100644 testData/arrayType/statement/arrayInitializationStatement.jav create mode 100644 testData/arrayType/statement/arrayInitializationStatement.kt create mode 100644 testData/arrayType/statement/arrayInitializationStatementWithDimension.jav create mode 100644 testData/arrayType/statement/arrayInitializationStatementWithDimension.kt create mode 100644 testData/arrayType/statement_mult/doubleArray.jav create mode 100644 testData/arrayType/statement_mult/doubleArray.kt create mode 100644 testData/arrayType/statement_mult/longArray.jav create mode 100644 testData/arrayType/statement_mult/longArray.kt create mode 100644 testData/arrayType/statement_mult/newIntArray.jav create mode 100644 testData/arrayType/statement_mult/newIntArray.kt create mode 100644 testData/arrayType/statement_mult/newStringArray.jav create mode 100644 testData/arrayType/statement_mult/newStringArray.kt create mode 100644 testData/assertStatement/statement_mult/onlyCondition.jav create mode 100644 testData/assertStatement/statement_mult/onlyCondition.kt create mode 100644 testData/assertStatement/statement_mult/onlyConditionWithBraces.jav create mode 100644 testData/assertStatement/statement_mult/onlyConditionWithBraces.kt create mode 100644 testData/assertStatement/statement_mult/withStringDetail.jav create mode 100644 testData/assertStatement/statement_mult/withStringDetail.kt create mode 100644 testData/assignmentExpression/expression_mult/and.jav create mode 100644 testData/assignmentExpression/expression_mult/and.kt create mode 100644 testData/assignmentExpression/expression_mult/assignment.jav create mode 100644 testData/assignmentExpression/expression_mult/assignment.kt create mode 100644 testData/assignmentExpression/expression_mult/divideAssign.jav create mode 100644 testData/assignmentExpression/expression_mult/divideAssign.kt create mode 100644 testData/assignmentExpression/expression_mult/minusAssign.jav create mode 100644 testData/assignmentExpression/expression_mult/minusAssign.kt create mode 100644 testData/assignmentExpression/expression_mult/multiplyAssign.jav create mode 100644 testData/assignmentExpression/expression_mult/multiplyAssign.kt create mode 100644 testData/assignmentExpression/expression_mult/or.jav create mode 100644 testData/assignmentExpression/expression_mult/or.kt create mode 100644 testData/assignmentExpression/expression_mult/plusAssign.jav create mode 100644 testData/assignmentExpression/expression_mult/plusAssign.kt create mode 100644 testData/assignmentExpression/expression_mult/reminder.jav create mode 100644 testData/assignmentExpression/expression_mult/reminder.kt create mode 100644 testData/assignmentExpression/expression_mult/shiftLeft.jav create mode 100644 testData/assignmentExpression/expression_mult/shiftLeft.kt create mode 100644 testData/assignmentExpression/expression_mult/shiftRight.jav create mode 100644 testData/assignmentExpression/expression_mult/shiftRight.kt create mode 100644 testData/assignmentExpression/expression_mult/unsignedRightShift.jav create mode 100644 testData/assignmentExpression/expression_mult/unsignedRightShift.kt create mode 100644 testData/assignmentExpression/expression_mult/xor.jav create mode 100644 testData/assignmentExpression/expression_mult/xor.kt create mode 100644 testData/assignmentExpression/statement/simpleAssignment.jav create mode 100644 testData/assignmentExpression/statement/simpleAssignment.kt create mode 100644 testData/binaryExpression/expression_mult/and.jav create mode 100644 testData/binaryExpression/expression_mult/and.kt create mode 100644 testData/binaryExpression/expression_mult/conditionalAnd.jav create mode 100644 testData/binaryExpression/expression_mult/conditionalAnd.kt create mode 100644 testData/binaryExpression/expression_mult/conditionalOr.jav create mode 100644 testData/binaryExpression/expression_mult/conditionalOr.kt create mode 100644 testData/binaryExpression/expression_mult/divide.jav create mode 100644 testData/binaryExpression/expression_mult/divide.kt create mode 100644 testData/binaryExpression/expression_mult/greaterThan.jav create mode 100644 testData/binaryExpression/expression_mult/greaterThan.kt create mode 100644 testData/binaryExpression/expression_mult/greaterThanEqual.jav create mode 100644 testData/binaryExpression/expression_mult/greaterThanEqual.kt create mode 100644 testData/binaryExpression/expression_mult/lessThan.jav create mode 100644 testData/binaryExpression/expression_mult/lessThan.kt create mode 100644 testData/binaryExpression/expression_mult/lessThanEqual.jav create mode 100644 testData/binaryExpression/expression_mult/lessThanEqual.kt create mode 100644 testData/binaryExpression/expression_mult/minus.jav create mode 100644 testData/binaryExpression/expression_mult/minus.kt create mode 100644 testData/binaryExpression/expression_mult/multiply.jav create mode 100644 testData/binaryExpression/expression_mult/multiply.kt create mode 100644 testData/binaryExpression/expression_mult/or.jav create mode 100644 testData/binaryExpression/expression_mult/or.kt create mode 100644 testData/binaryExpression/expression_mult/plus.jav create mode 100644 testData/binaryExpression/expression_mult/plus.kt create mode 100644 testData/binaryExpression/expression_mult/remainder.jav create mode 100644 testData/binaryExpression/expression_mult/remainder.kt create mode 100644 testData/binaryExpression/expression_mult/shiftLeft.jav create mode 100644 testData/binaryExpression/expression_mult/shiftLeft.kt create mode 100644 testData/binaryExpression/expression_mult/shiftRight.jav create mode 100644 testData/binaryExpression/expression_mult/shiftRight.kt create mode 100644 testData/binaryExpression/expression_mult/unsignedRightShift.jav create mode 100644 testData/binaryExpression/expression_mult/unsignedRightShift.kt create mode 100644 testData/binaryExpression/expression_mult/xor.jav create mode 100644 testData/binaryExpression/expression_mult/xor.kt create mode 100644 testData/boxedType/statement_mult/boolean.jav create mode 100644 testData/boxedType/statement_mult/boolean.kt create mode 100644 testData/boxedType/statement_mult/byte.jav create mode 100644 testData/boxedType/statement_mult/byte.kt create mode 100644 testData/boxedType/statement_mult/character.jav create mode 100644 testData/boxedType/statement_mult/character.kt create mode 100644 testData/boxedType/statement_mult/double.jav create mode 100644 testData/boxedType/statement_mult/double.kt create mode 100644 testData/boxedType/statement_mult/float.jav create mode 100644 testData/boxedType/statement_mult/float.kt create mode 100644 testData/boxedType/statement_mult/integer.jav create mode 100644 testData/boxedType/statement_mult/integer.kt create mode 100644 testData/boxedType/statement_mult/long.jav create mode 100644 testData/boxedType/statement_mult/long.kt create mode 100644 testData/boxedType/statement_mult/object.jav create mode 100644 testData/boxedType/statement_mult/object.kt create mode 100644 testData/boxedType/statement_mult/short.jav create mode 100644 testData/boxedType/statement_mult/short.kt create mode 100644 testData/breakStatement/statement/breakWithLabel.jav create mode 100644 testData/breakStatement/statement/breakWithLabel.kt create mode 100644 testData/breakStatement/statement/breakWithoutLabel.jav create mode 100644 testData/breakStatement/statement/breakWithoutLabel.kt create mode 100644 testData/class_/class/class.jav create mode 100644 testData/class_/class/class.kt create mode 100644 testData/class_/class/emptyClass.jav create mode 100644 testData/class_/class/emptyClass.kt create mode 100644 testData/class_/class/extendsOneClassAndImplementsOneInterface.jav create mode 100644 testData/class_/class/extendsOneClassAndImplementsOneInterface.kt create mode 100644 testData/class_/class/extendsOneClassAndImplementsSeveralInterfaces.jav create mode 100644 testData/class_/class/extendsOneClassAndImplementsSeveralInterfaces.kt create mode 100644 testData/class_/class/finalClass.jav create mode 100644 testData/class_/class/finalClass.kt create mode 100644 testData/class_/class/genericClass.jav create mode 100644 testData/class_/class/genericClass.kt create mode 100644 testData/class_/class/innerEmptyClass.jav create mode 100644 testData/class_/class/innerEmptyClass.kt create mode 100644 testData/class_/class/innerStaticClass.jav create mode 100644 testData/class_/class/innerStaticClass.kt create mode 100644 testData/class_/class/internalClass.jav create mode 100644 testData/class_/class/internalClass.kt create mode 100644 testData/class_/class/oneStaticFieldOneNonStatic.jav create mode 100644 testData/class_/class/oneStaticFieldOneNonStatic.kt create mode 100644 testData/class_/class/oneStaticMethod.jav create mode 100644 testData/class_/class/oneStaticMethod.kt create mode 100644 testData/class_/class/oneStaticMethodOneNonStatic.jav create mode 100644 testData/class_/class/oneStaticMethodOneNonStatic.kt create mode 100644 testData/class_/class/pivateClass.jav create mode 100644 testData/class_/class/pivateClass.kt create mode 100644 testData/class_/class/protectedClass.jav create mode 100644 testData/class_/class/protectedClass.kt create mode 100644 testData/class_/class/publicClass.jav create mode 100644 testData/class_/class/publicClass.kt create mode 100644 testData/class_/class/simpleInheritance.jav create mode 100644 testData/class_/class/simpleInheritance.kt create mode 100644 testData/class_/class/twoStaticMethod.jav create mode 100644 testData/class_/class/twoStaticMethod.kt create mode 100644 testData/class_/class_mult/classWithEmptyMethods.jav create mode 100644 testData/class_/class_mult/classWithEmptyMethods.kt create mode 100644 testData/class_/class_mult/classWithFields.jav create mode 100644 testData/class_/class_mult/classWithFields.kt create mode 100644 testData/class_/class_mult/classWithMultiplyFields.jav create mode 100644 testData/class_/class_mult/classWithMultiplyFields.kt create mode 100644 testData/conditionalExpression/expression_mult/simpleConditionalExpression.jav create mode 100644 testData/conditionalExpression/expression_mult/simpleConditionalExpression.kt create mode 100644 testData/continueStatement/statement/continueWithLabel.jav create mode 100644 testData/continueStatement/statement/continueWithLabel.kt create mode 100644 testData/continueStatement/statement/continueWithoutLabel.jav create mode 100644 testData/continueStatement/statement/continueWithoutLabel.kt create mode 100644 testData/declarationStatement/statement/singleFinalIntDeclaration.jav create mode 100644 testData/declarationStatement/statement/singleFinalIntDeclaration.kt create mode 100644 testData/declarationStatement/statement/singleFinalStringDeclaration.jav create mode 100644 testData/declarationStatement/statement/singleFinalStringDeclaration.kt create mode 100644 testData/declarationStatement/statement/singleIntDeclaration.jav create mode 100644 testData/declarationStatement/statement/singleIntDeclaration.kt create mode 100644 testData/declarationStatement/statement/singleStringDeclaration.jav create mode 100644 testData/declarationStatement/statement/singleStringDeclaration.kt create mode 100644 testData/declarationStatement/statement_mult/multiplyFinalIntDeclaration.jav create mode 100644 testData/declarationStatement/statement_mult/multiplyFinalIntDeclaration.kt create mode 100644 testData/declarationStatement/statement_mult/multiplyIntDeclaration.jav create mode 100644 testData/declarationStatement/statement_mult/multiplyIntDeclaration.kt create mode 100644 testData/doWhileStatement/statement_mult/whileWithBlock.jav create mode 100644 testData/doWhileStatement/statement_mult/whileWithBlock.kt create mode 100644 testData/doWhileStatement/statement_mult/whileWithEmptyBlock.jav create mode 100644 testData/doWhileStatement/statement_mult/whileWithEmptyBlock.kt create mode 100644 testData/doWhileStatement/statement_mult/whileWithExpression.jav create mode 100644 testData/doWhileStatement/statement_mult/whileWithExpression.kt create mode 100644 testData/doWhileStatement/statement_mult/whileWithReturn.jav create mode 100644 testData/doWhileStatement/statement_mult/whileWithReturn.kt create mode 100644 testData/enum/class/emptyEnum.jav create mode 100644 testData/enum/class/emptyEnum.kt create mode 100644 testData/enum/class/enumImplementsOneInterface.jav create mode 100644 testData/enum/class/enumImplementsOneInterface.kt create mode 100644 testData/enum/class/enumImplementsSeveralInterfaces.jav create mode 100644 testData/enum/class/enumImplementsSeveralInterfaces.kt create mode 100644 testData/enum/class/internalEnum.jav create mode 100644 testData/enum/class/internalEnum.kt create mode 100644 testData/enum/class/privateEnum.jav create mode 100644 testData/enum/class/privateEnum.kt create mode 100644 testData/enum/class/protectedEnum.jav create mode 100644 testData/enum/class/protectedEnum.kt create mode 100644 testData/enum/class/publicEnum.jav create mode 100644 testData/enum/class/publicEnum.kt create mode 100644 testData/enum/class_mult/enumWithNameField.jav create mode 100644 testData/enum/class_mult/enumWithNameField.kt create mode 100644 testData/enum/class_mult/fieldsWithPrimaryPrivateConstructor.jav create mode 100644 testData/enum/class_mult/fieldsWithPrimaryPrivateConstructor.kt create mode 100644 testData/enum/class_mult/overrideToString.jav create mode 100644 testData/enum/class_mult/overrideToString.kt create mode 100644 testData/enum/class_mult/runnableImplementation.jav create mode 100644 testData/enum/class_mult/runnableImplementation.kt create mode 100644 testData/enum/class_mult/typeSafeEnum.jav create mode 100644 testData/enum/class_mult/typeSafeEnum.kt create mode 100644 testData/field/method/internalField.jav create mode 100644 testData/field/method/internalField.kt create mode 100644 testData/field/method/privateField.jav create mode 100644 testData/field/method/privateField.kt create mode 100644 testData/field/method/protectedField.jav create mode 100644 testData/field/method/protectedField.kt create mode 100644 testData/field/method/publicField.jav create mode 100644 testData/field/method/publicField.kt create mode 100644 testData/field/method/valWithInit.jav create mode 100644 testData/field/method/valWithInit.kt create mode 100644 testData/field/method/varWithInit.jav create mode 100644 testData/field/method/varWithInit.kt create mode 100644 testData/field/method/varWithoutInit.jav create mode 100644 testData/field/method/varWithoutInit.kt create mode 100644 testData/file_/file/packageWithClass.jav create mode 100644 testData/file_/file/packageWithClass.kt create mode 100644 testData/file_/file/packageWithClasses.jav create mode 100644 testData/file_/file/packageWithClasses.kt create mode 100644 testData/file_/file/packageWithOpenClass.jav create mode 100644 testData/file_/file/packageWithOpenClass.kt create mode 100644 testData/file_/file_mult/packageWithImports.jav create mode 100644 testData/file_/file_mult/packageWithImports.kt create mode 100644 testData/file_/file_mult/packageWithMixedImports.jav create mode 100644 testData/file_/file_mult/packageWithMixedImports.kt create mode 100644 testData/file_/file_mult/packageWithStaticImports.jav create mode 100644 testData/file_/file_mult/packageWithStaticImports.kt create mode 100644 testData/for/statement_mult/commonCaseForTest.jav create mode 100644 testData/for/statement_mult/commonCaseForTest.kt create mode 100644 testData/for/statement_mult/forWithBlock.jav create mode 100644 testData/for/statement_mult/forWithBlock.kt create mode 100644 testData/for/statement_mult/forWithBlockAndDoubleUpdate.jav create mode 100644 testData/for/statement_mult/forWithBlockAndDoubleUpdate.kt create mode 100644 testData/for/statement_mult/forWithEmptyBlock.jav create mode 100644 testData/for/statement_mult/forWithEmptyBlock.kt create mode 100644 testData/for/statement_mult/forWithExpression.jav create mode 100644 testData/for/statement_mult/forWithExpression.kt create mode 100644 testData/for/statement_mult/forWithReturn.jav create mode 100644 testData/for/statement_mult/forWithReturn.kt create mode 100644 testData/foreachStatement/statement_mult/enhancedForWithBlock.jav create mode 100644 testData/foreachStatement/statement_mult/enhancedForWithBlock.kt create mode 100644 testData/foreachStatement/statement_mult/enhancedForWithEmptyBlock.jav create mode 100644 testData/foreachStatement/statement_mult/enhancedForWithEmptyBlock.kt create mode 100644 testData/foreachStatement/statement_mult/enhancedForWithExpression.jav create mode 100644 testData/foreachStatement/statement_mult/enhancedForWithExpression.kt create mode 100644 testData/foreachStatement/statement_mult/enhancedForWithReturn.jav create mode 100644 testData/foreachStatement/statement_mult/enhancedForWithReturn.kt create mode 100644 testData/function/file/override.jav create mode 100644 testData/function/file/override.kt create mode 100644 testData/function/method/classGenericParam.jav create mode 100644 testData/function/method/classGenericParam.kt create mode 100644 testData/function/method/emptyVoidMethod.jav create mode 100644 testData/function/method/emptyVoidMethod.kt create mode 100644 testData/function/method/internal.jav create mode 100644 testData/function/method/internal.kt create mode 100644 testData/function/method/methodClassType.jav create mode 100644 testData/function/method/methodClassType.kt create mode 100644 testData/function/method/methodPrimitiveType.jav create mode 100644 testData/function/method/methodPrimitiveType.kt create mode 100644 testData/function/method/methodPrimitiveType2.jav create mode 100644 testData/function/method/methodPrimitiveType2.kt create mode 100644 testData/function/method/methodWithReturnStatement.jav create mode 100644 testData/function/method/methodWithReturnStatement.kt create mode 100644 testData/function/method/ownGenericParam.jav create mode 100644 testData/function/method/ownGenericParam.kt create mode 100644 testData/function/method/ownSeveralGenericParams.jav create mode 100644 testData/function/method/ownSeveralGenericParams.kt create mode 100644 testData/function/method/private.jav create mode 100644 testData/function/method/private.kt create mode 100644 testData/function/method/protected.jav create mode 100644 testData/function/method/protected.kt create mode 100644 testData/function/method/public.jav create mode 100644 testData/function/method/public.kt create mode 100644 testData/ifStatement/statement_mult/ifStatementWithEmptyBlocks.jav create mode 100644 testData/ifStatement/statement_mult/ifStatementWithEmptyBlocks.kt create mode 100644 testData/ifStatement/statement_mult/ifStatementWithMultilineBlocks.jav create mode 100644 testData/ifStatement/statement_mult/ifStatementWithMultilineBlocks.kt create mode 100644 testData/ifStatement/statement_mult/ifStatementWithOneLineBlocks.jav create mode 100644 testData/ifStatement/statement_mult/ifStatementWithOneLineBlocks.kt create mode 100644 testData/ifStatement/statement_mult/ifStatementWithoutElse.jav create mode 100644 testData/ifStatement/statement_mult/ifStatementWithoutElse.kt create mode 100644 testData/inProjectionType/method/methodParams.jav create mode 100644 testData/inProjectionType/method/methodParams.kt create mode 100644 testData/isOperator/expression_mult/complicatedExpression.jav create mode 100644 testData/isOperator/expression_mult/complicatedExpression.kt create mode 100644 testData/isOperator/expression_mult/simpleReference.jav create mode 100644 testData/isOperator/expression_mult/simpleReference.kt create mode 100644 testData/labelStatement/statement_mult/complicatedExampleFromJavaTutorial.jav create mode 100644 testData/labelStatement/statement_mult/complicatedExampleFromJavaTutorial.kt create mode 100644 testData/localVariable/statement/object.jav create mode 100644 testData/localVariable/statement/object.kt create mode 100644 testData/methodCallExpression/statement/callWithKeywords.jav create mode 100644 testData/methodCallExpression/statement/callWithKeywords.kt create mode 100644 testData/methodCallExpression/statement/emptyCall.jav create mode 100644 testData/methodCallExpression/statement/emptyCall.kt create mode 100644 testData/methodCallExpression/statement/simpleCall.jav create mode 100644 testData/methodCallExpression/statement/simpleCall.kt create mode 100644 testData/newClassExpression/expression/classWithParam.jav create mode 100644 testData/newClassExpression/expression/classWithParam.kt create mode 100644 testData/newClassExpression/expression/classWithParams.jav create mode 100644 testData/newClassExpression/expression/classWithParams.kt create mode 100644 testData/newClassExpression/expression/classWithoutBody.jav create mode 100644 testData/newClassExpression/expression/classWithoutBody.kt create mode 100644 testData/newClassExpression/expression/classWithoutBody2.jav create mode 100644 testData/newClassExpression/expression/classWithoutBody2.kt create mode 100644 testData/outProjectionType/method/methodParams.jav create mode 100644 testData/outProjectionType/method/methodParams.kt create mode 100644 testData/parenthesizedExpression/expression/parenthesized.jav create mode 100644 testData/parenthesizedExpression/expression/parenthesized.kt create mode 100644 testData/parenthesizedExpression/expression/parenthesized2.jav create mode 100644 testData/parenthesizedExpression/expression/parenthesized2.kt create mode 100644 testData/polyadicExpression/expression_mult/divide.jav create mode 100644 testData/polyadicExpression/expression_mult/divide.kt create mode 100644 testData/polyadicExpression/expression_mult/minus.jav create mode 100644 testData/polyadicExpression/expression_mult/minus.kt create mode 100644 testData/polyadicExpression/expression_mult/multiply.jav create mode 100644 testData/polyadicExpression/expression_mult/multiply.kt create mode 100644 testData/polyadicExpression/expression_mult/plus.jav create mode 100644 testData/polyadicExpression/expression_mult/plus.kt create mode 100644 testData/polyadicExpression/expression_mult/remainder.jav create mode 100644 testData/polyadicExpression/expression_mult/remainder.kt create mode 100644 testData/postfixOperator/statement_mult/decrement.jav create mode 100644 testData/postfixOperator/statement_mult/decrement.kt create mode 100644 testData/postfixOperator/statement_mult/increment.jav create mode 100644 testData/postfixOperator/statement_mult/increment.kt create mode 100644 testData/prefixOperator/statement_mult/decrement.jav create mode 100644 testData/prefixOperator/statement_mult/decrement.kt create mode 100644 testData/prefixOperator/statement_mult/increment.jav create mode 100644 testData/prefixOperator/statement_mult/increment.kt create mode 100644 testData/returnStatement/statement/returnChar.jav create mode 100644 testData/returnStatement/statement/returnChar.kt create mode 100644 testData/returnStatement/statement/returnLiteral.jav create mode 100644 testData/returnStatement/statement/returnLiteral.kt create mode 100644 testData/returnStatement/statement/returnNumber.jav create mode 100644 testData/returnStatement/statement/returnNumber.kt create mode 100644 testData/returnStatement/statement/returnString.jav create mode 100644 testData/returnStatement/statement/returnString.kt create mode 100644 testData/starProjectionType/method/methodParams.jav create mode 100644 testData/starProjectionType/method/methodParams.kt create mode 100644 testData/synchronizedStatement/statement/singleLineExample.jav create mode 100644 testData/synchronizedStatement/statement/singleLineExample.kt create mode 100644 testData/throwStatement/statement/simpleThrowStatement.jav create mode 100644 testData/throwStatement/statement/simpleThrowStatement.kt create mode 100644 testData/trait/class/emptyInterface.jav create mode 100644 testData/trait/class/emptyInterface.kt create mode 100644 testData/trait/class/extendsOneClassAndImplementsSeveralInterfaces.jav create mode 100644 testData/trait/class/extendsOneClassAndImplementsSeveralInterfaces.kt create mode 100644 testData/trait/class/extendsOneInterface.jav create mode 100644 testData/trait/class/extendsOneInterface.kt create mode 100644 testData/trait/class/internalInterface.jav create mode 100644 testData/trait/class/internalInterface.kt create mode 100644 testData/trait/class/privateInterface.jav create mode 100644 testData/trait/class/privateInterface.kt create mode 100644 testData/trait/class/protectedInterface.jav create mode 100644 testData/trait/class/protectedInterface.kt create mode 100644 testData/trait/class/publicInterface.jav create mode 100644 testData/trait/class/publicInterface.kt create mode 100644 testData/trait/class_mult/interfaceWithFields.jav create mode 100644 testData/trait/class_mult/interfaceWithFields.kt create mode 100644 testData/trait/class_mult/interfaceWithMethodDeclaration.jav create mode 100644 testData/trait/class_mult/interfaceWithMethodDeclaration.kt create mode 100644 testData/trait/class_mult/interfaceWithStaticFields.jav create mode 100644 testData/trait/class_mult/interfaceWithStaticFields.kt create mode 100644 testData/tryStatement/statement_mult/commonCaseForTryStatement.jav create mode 100644 testData/tryStatement/statement_mult/commonCaseForTryStatement.kt create mode 100644 testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithEmptyFinally.jav create mode 100644 testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithEmptyFinally.kt create mode 100644 testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithFinally.jav create mode 100644 testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithFinally.kt create mode 100644 testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithoutFinally.jav create mode 100644 testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithoutFinally.kt create mode 100644 testData/typeCastExpression/expression_mult/extendsWildcardCast.jav create mode 100644 testData/typeCastExpression/expression_mult/extendsWildcardCast.kt create mode 100644 testData/typeCastExpression/expression_mult/fooCast.jav create mode 100644 testData/typeCastExpression/expression_mult/fooCast.kt create mode 100644 testData/typeCastExpression/expression_mult/intCast.jav create mode 100644 testData/typeCastExpression/expression_mult/intCast.kt create mode 100644 testData/typeCastExpression/expression_mult/primitiveType.jav create mode 100644 testData/typeCastExpression/expression_mult/primitiveType.kt create mode 100644 testData/typeCastExpression/expression_mult/simpleGenericCast.jav create mode 100644 testData/typeCastExpression/expression_mult/simpleGenericCast.kt create mode 100644 testData/typeCastExpression/expression_mult/stringCast.jav create mode 100644 testData/typeCastExpression/expression_mult/stringCast.kt create mode 100644 testData/typeCastExpression/expression_mult/superWildcardCast.jav create mode 100644 testData/typeCastExpression/expression_mult/superWildcardCast.kt create mode 100644 testData/typeCastExpression/expression_mult/wildcardCast.jav create mode 100644 testData/typeCastExpression/expression_mult/wildcardCast.kt create mode 100644 testData/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.jav create mode 100644 testData/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.kt create mode 100644 testData/typeParameters/class/classParametrizationWithTwoBounds.jav create mode 100644 testData/typeParameters/class/classParametrizationWithTwoBounds.kt create mode 100644 testData/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.jav create mode 100644 testData/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.kt create mode 100644 testData/typeParameters/class/complexExampleWithClassExtending.jav create mode 100644 testData/typeParameters/class/complexExampleWithClassExtending.kt create mode 100644 testData/typeParameters/class/complexExampleWithClassMultiplyExtending.jav create mode 100644 testData/typeParameters/class/complexExampleWithClassMultiplyExtending.kt create mode 100644 testData/typeParameters/class/genericClass.jav create mode 100644 testData/typeParameters/class/genericClass.kt create mode 100644 testData/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.jav create mode 100644 testData/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.kt create mode 100644 testData/typeParameters/method/methodDoubleParametrizationWithTwoBounds.jav create mode 100644 testData/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt create mode 100644 testData/typeParameters/method/where.jav create mode 100644 testData/typeParameters/method/where.kt create mode 100644 testData/typeParameters/statement_mult/genericParam.jav create mode 100644 testData/typeParameters/statement_mult/genericParam.kt create mode 100644 testData/typeParameters/statement_mult/manyGenericParams.jav create mode 100644 testData/typeParameters/statement_mult/manyGenericParams.kt create mode 100644 testData/varArg/method/ellipsisTypeSeveralParams.jav create mode 100644 testData/varArg/method/ellipsisTypeSeveralParams.kt create mode 100644 testData/varArg/method/ellipsisTypeSingleParams.jav create mode 100644 testData/varArg/method/ellipsisTypeSingleParams.kt create mode 100644 testData/whileStatement/statement_mult/whileWithBlock.jav create mode 100644 testData/whileStatement/statement_mult/whileWithBlock.kt create mode 100644 testData/whileStatement/statement_mult/whileWithEmptyBlock.jav create mode 100644 testData/whileStatement/statement_mult/whileWithEmptyBlock.kt create mode 100644 testData/whileStatement/statement_mult/whileWithExpression.jav create mode 100644 testData/whileStatement/statement_mult/whileWithExpression.kt create mode 100644 testData/whileStatement/statement_mult/whileWithReturn.jav create mode 100644 testData/whileStatement/statement_mult/whileWithReturn.kt diff --git a/test/org/jetbrains/jet/j2k/JetTestCaseBase.java b/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java similarity index 53% rename from test/org/jetbrains/jet/j2k/JetTestCaseBase.java rename to test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java index 9732820ad6d..2fec5296537 100644 --- a/test/org/jetbrains/jet/j2k/JetTestCaseBase.java +++ b/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java @@ -1,89 +1,123 @@ package org.jetbrains.jet.j2k; import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase; -import com.intellij.openapi.application.PathManager; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; import com.intellij.psi.PsiJavaFile; +import junit.framework.Assert; import junit.framework.Test; import junit.framework.TestSuite; import org.jetbrains.annotations.NotNull; +import java.io.BufferedReader; import java.io.File; -import java.io.FileFilter; -import java.io.FilenameFilter; +import java.io.FileReader; import java.io.IOException; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; + +import static org.jetbrains.jet.j2k.TestCaseBuilder.getTestDataPathBase; /** - * @author abreslav + * @author ignatov */ -public abstract class JetTestCaseBase extends LightDaemonAnalyzerTestCase { - private boolean checkInfos = false; - private final String dataPath; - private final String name; +public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase { + private String myDataPath; + private String myName; - protected JetTestCaseBase() { - this("", ""); + public JavaToKotlinConverterTest(String dataPath, String name) { + myDataPath = dataPath; + myName = name; } - private JetTestCaseBase(String dataPath, String name) { - this.dataPath = dataPath; - this.name = name; + private static String readFileAsString(String filePath) + throws java.io.IOException { + StringBuffer fileData = new StringBuffer(1000); + BufferedReader reader = new BufferedReader( + new FileReader(filePath)); + char[] buf = new char[1024]; + int numRead = 0; + while ((numRead = reader.read(buf)) != -1) { + String readData = String.valueOf(buf, 0, numRead); + fileData.append(readData); + buf = new char[1024]; + } + reader.close(); + return fileData.toString(); } - public final JetTestCaseBase setCheckInfos(boolean checkInfos) { - this.checkInfos = checkInfos; - return this; + @Override + protected void runTest() throws Throwable { + String javaPath = getTestDataPath() + File.separator + getTestFilePath(); + String kotlinPath = javaPath.replace(".jav", ".kt"); + + String expected = readFileAsString(kotlinPath); + + String actual = ""; + if (javaPath.contains("/expression_mult/")) actual = expressionToKotlin(readFileAsString(javaPath)); + else if (javaPath.contains("/expression/")) actual = expressionToKotlin(readFileAsString(javaPath)); + else if (javaPath.contains("/statement/")) actual = statementToSingleLineKotlin(readFileAsString(javaPath)); + else if (javaPath.contains("/statement_mult/")) actual = statementToKotlin(readFileAsString(javaPath)); + + else if (javaPath.contains("/method/")) actual = methodToSingleLineKotlin(readFileAsString(javaPath)); + else if (javaPath.contains("/method_mult/")) actual = methodToKotlin(readFileAsString(javaPath)); + + else if (javaPath.contains("/class/")) actual = classToSingleLineKotlin(readFileAsString(javaPath)); + else if (javaPath.contains("/class_mult/")) actual = classToKotlin(readFileAsString(javaPath)); + + else if (javaPath.contains("/file/")) actual = fileToSingleLineKotlin(readFileAsString(javaPath)); + else if (javaPath.contains("/file_mult/")) actual = fileToKotlin(readFileAsString(javaPath)); + + assert !actual.equals(""); + Assert.assertEquals(expected, actual); + } + + @NotNull + protected String getTestFilePath() { + return myDataPath + File.separator + myName + ".jav"; + } + + @Override + protected String getTestDataPath() { + return "testData"; } private static Sdk jdkFromIdeaHome() { return new JavaSdkImpl().createJdk("JDK", "jre", true); } - @Override - protected String getTestDataPath() { - return getTestDataPathBase(); - } - - private static String getTestDataPathBase() { - return getHomeDirectory() + "/compiler/testData"; - } - - private static String getHomeDirectory() { - return new File(PathManager.getResourceRoot(JetTestCaseBase.class, "/org/jetbrains/jet/JetTestCaseBase.class")).getParentFile().getParentFile().getParent(); - } - - @Override protected Sdk getProjectJDK() { return jdkFromIdeaHome(); } -// @Override -// public String getName() { -// return "test" + name; -// } - -// @Override -// protected void runTest() throws Throwable { -// doTest(getTestFilePath(), true, checkInfos); -// } - - @NotNull - protected String getTestFilePath() { - return dataPath + File.separator + name + ".jet"; + @Override + public String getName() { + return "test_" + myName; } - protected String getDataPath() { - return dataPath; + public static Test suite() { + TestSuite suite = new TestSuite(); + suite.addTest(TestCaseBuilder.suiteForDirectory(getTestDataPathBase(), "", true, new TestCaseBuilder.NamedTestFactory() { + @NotNull + @Override + public Test createTest(@NotNull String dataPath, @NotNull String name) { + return new JavaToKotlinConverterTest(dataPath, name); + } + })); + return suite; } void configureFromText(String text) throws IOException { configureFromFileText("test.java", text); } + protected String fileToKotlin(String text) throws IOException { + configureFromText(text); + return prettify(Converter.fileToFile((PsiJavaFile) myFile).toKotlin()); + } + + protected String fileToSingleLineKotlin(String text) throws IOException { + return toSingleLine(fileToKotlin(text)); + } + @NotNull protected String classToKotlin(String text) throws IOException { configureFromText(text); @@ -100,15 +134,6 @@ public abstract class JetTestCaseBase extends LightDaemonAnalyzerTestCase { return toSingleLine(classToKotlin(text)); } - protected String fileToKotlin(String text) throws IOException { - configureFromText(text); - return prettify(Converter.fileToFile((PsiJavaFile) myFile).toKotlin()); - } - - protected String fileToSingleLineKotlin(String text) throws IOException { - return toSingleLine(fileToKotlin(text)); - } - protected String methodToKotlin(String text) throws IOException { String result = classToKotlin("final class C {" + text + "}") .replaceAll("class C \\{", ""); @@ -141,47 +166,6 @@ public abstract class JetTestCaseBase extends LightDaemonAnalyzerTestCase { return toSingleLine(expressionToKotlin(code)); } - public interface NamedTestFactory { - @NotNull - Test createTest(@NotNull String dataPath, @NotNull String name); - } - - @NotNull - private static TestSuite suiteForDirectory(String baseDataDir, @NotNull final String dataPath, boolean recursive, @NotNull NamedTestFactory factory) { - TestSuite suite = new TestSuite(dataPath); - final String extension = ".jet"; - FilenameFilter extensionFilter = new FilenameFilter() { - @Override - public boolean accept(File dir, String name) { - return name.endsWith(extension); - } - }; - File dir = new File(baseDataDir + dataPath); - FileFilter dirFilter = new FileFilter() { - @Override - public boolean accept(File pathname) { - return pathname.isDirectory(); - } - }; - if (recursive) { - File[] files = dir.listFiles(dirFilter); - assert files != null : dir; - List subdirs = Arrays.asList(files); - Collections.sort(subdirs); - for (File subdir : subdirs) { - suite.addTest(suiteForDirectory(baseDataDir, dataPath + "/" + subdir.getName(), recursive, factory)); - } - } - List files = Arrays.asList(dir.listFiles(extensionFilter)); - Collections.sort(files); - for (File file : files) { - String fileName = file.getName(); - assert fileName != null; - suite.addTest(factory.createTest(dataPath, fileName.substring(0, fileName.length() - extension.length()))); - } - return suite; - } - @NotNull private static String prettify(String code) { if (code == null) diff --git a/test/org/jetbrains/jet/j2k/TestCaseBuilder.java b/test/org/jetbrains/jet/j2k/TestCaseBuilder.java new file mode 100644 index 00000000000..ac4250359d0 --- /dev/null +++ b/test/org/jetbrains/jet/j2k/TestCaseBuilder.java @@ -0,0 +1,91 @@ +package org.jetbrains.jet.j2k; + +import com.intellij.openapi.application.PathManager; +import junit.framework.Test; +import junit.framework.TestSuite; +import org.jetbrains.annotations.NotNull; + +import java.io.File; +import java.io.FileFilter; +import java.io.FilenameFilter; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +/** + * @author ignatov + */ +public abstract class TestCaseBuilder { + private static FilenameFilter emptyFilter = new FilenameFilter() { + @Override + public boolean accept(File file, String name) { + return true; + } + }; + + public static String getTestDataPathBase() { + return "testData"; + } + + public static String getHomeDirectory() { + return new File(PathManager.getResourceRoot(TestCaseBuilder.class, "/org/jetbrains/jet/TestCaseBuilder.class")).getParentFile().getParentFile().getParent(); + } + + public interface NamedTestFactory { + @NotNull Test createTest(@NotNull String dataPath, @NotNull String name); + } + + @NotNull + public static TestSuite suiteForDirectory(String baseDataDir, @NotNull final String dataPath, boolean recursive, @NotNull NamedTestFactory factory) { + return suiteForDirectory(baseDataDir, dataPath, recursive, emptyFilter, factory); + } + + @NotNull + public static TestSuite suiteForDirectory(String baseDataDir, @NotNull final String dataPath, boolean recursive, final FilenameFilter filter, @NotNull NamedTestFactory factory) { + TestSuite suite = new TestSuite(dataPath); + final String extensionJava = ".jav"; + + final FilenameFilter extensionFilter = new FilenameFilter() { + @Override + public boolean accept(File dir, String name) { + return name.endsWith(extensionJava); + } + }; + FilenameFilter resultFilter; + if (filter != emptyFilter) { + resultFilter = new FilenameFilter() { + @Override + public boolean accept(File file, String s) { + return extensionFilter.accept(file, s) && filter.accept(file, s); + } + }; + } + else { + resultFilter = extensionFilter; + } + File dir = new File(baseDataDir + dataPath); + FileFilter dirFilter = new FileFilter() { + @Override + public boolean accept(File pathname) { + return pathname.isDirectory(); + } + }; + if (recursive) { + File[] files = dir.listFiles(dirFilter); + assert files != null : dir; + List subdirs = Arrays.asList(files); + Collections.sort(subdirs); + for (File subdir : subdirs) { + suite.addTest(suiteForDirectory(baseDataDir, dataPath + "/" + subdir.getName(), recursive, filter, factory)); + } + } + List files = Arrays.asList(dir.listFiles(resultFilter)); + Collections.sort(files); + for (File file : files) { + String fileName = file.getName(); + assert fileName != null; + suite.addTest(factory.createTest(dataPath, fileName.substring(0, fileName.length() - extensionJava.length()))); + } + return suite; + } +} diff --git a/test/org/jetbrains/jet/j2k/ast/ArrayAccessExpressionTest.java b/test/org/jetbrains/jet/j2k/ast/ArrayAccessExpressionTest.java deleted file mode 100644 index f6e47a68dd9..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/ArrayAccessExpressionTest.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class ArrayAccessExpressionTest extends JetTestCaseBase { - public void testIntIndex() throws Exception { - Assert.assertEquals(expressionToSingleLineKotlin("myArray[10]"), "myArray[10]"); - } - - public void testVariableIndex() throws Exception { - Assert.assertEquals(expressionToSingleLineKotlin("myArray[i]"), "myArray[i]"); - } - - public void testExpressionIndex() throws Exception { - Assert.assertEquals(expressionToSingleLineKotlin("myArray[myLibrary.calculateIndex(100)]"), "myArray[myLibrary.calculateIndex(100)]"); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/ArrayInitializerExpressionTest.java b/test/org/jetbrains/jet/j2k/ast/ArrayInitializerExpressionTest.java deleted file mode 100644 index fb24555f588..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/ArrayInitializerExpressionTest.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class ArrayInitializerExpressionTest extends JetTestCaseBase { - public void testOneDim() throws Exception { - Assert.assertEquals( - expressionToSingleLineKotlin("{1, 2, 3};"), - "array(1, 2, 3)" - ); - } - - public void testOneDimWithVariables() throws Exception { - Assert.assertEquals( - expressionToSingleLineKotlin("{a, b, c};"), - "array(a, b, c)" - ); - } - - public void testNewInt() throws Exception { - Assert.assertEquals( - expressionToSingleLineKotlin("new int[] {1, 2, 3};"), - "array(1, 2, 3)" - ); - } - - public void testTwoDim() throws Exception { - Assert.assertEquals( - expressionToSingleLineKotlin("{ {1, 2, 3}, {4, 5, 6}, {7, 8, 9} };"), - "array(array(1, 2, 3), array(4, 5, 6), array(7, 8, 9))" - ); - } - -// TODO -// public void testTwoDimNewInt() throws Exception { -// Assert.assertEquals( -// statementToSingleLineKotlin("int[][] myArray = new int[5][];"), -// "array(1, 2, 3)" -// ); -// } -} diff --git a/test/org/jetbrains/jet/j2k/ast/ArrayTypeTest.java b/test/org/jetbrains/jet/j2k/ast/ArrayTypeTest.java deleted file mode 100644 index 04b50fe1dc9..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/ArrayTypeTest.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class ArrayTypeTest extends JetTestCaseBase { - public void testNewStringArray() throws Exception { - Assert.assertEquals( - statementToKotlin("String[] a = new String[]{\"abc\"}"), - "var a : Array? = array(\"abc\")" - ); - } - - public void testNewIntArray() throws Exception { - Assert.assertEquals( - statementToKotlin("int[] a = new int[]{1, 2, 3}"), - "var a : IntArray? = array(1, 2, 3)" - ); - } - - public void testDoubleArray() throws Exception { - Assert.assertEquals( - statementToKotlin("double[] a = new double[]{1, 2, 3}"), - "var a : DoubleArray? = array(1, 2, 3)" - ); - } - - public void testLongArray() throws Exception { - Assert.assertEquals( - statementToKotlin("long[] a = new long[]{1, 2, 3}"), - "var a : LongArray? = array(1, 2, 3)" - ); - } - - public void testMethodArrayArgs() throws Exception { - Assert.assertEquals( - methodToSingleLineKotlin("void fromArrayToCollection(Foo[] a) {}"), - "fun fromArrayToCollection(a : Array?) : Unit { }" - ); - } - - public void testArrayInitializationStatement() throws Exception { - Assert.assertEquals( - statementToSingleLineKotlin("int [][] d2 = new int[][]{};"), - "var d2 : Array? = array()" // more precisely: "var d2 : Array? = array()" - ); - } - - public void testArrayInitializationStatementWithDimension() throws Exception { - Assert.assertEquals( - statementToSingleLineKotlin("int [][] d2 = new int[5][];"), - "var d2 : Array? = Array?(5, {null})" // another variant: "var d2 : Array? = array(5, {null, null, null, null, null})" - ); - } - -// public void testArrayInitializationStatementWithThreeDimension() throws Exception { -// Assert.assertEquals( -// statementToSingleLineKotlin("int[][][] d3= new int[5][5][5];"), -// "var d3 : Array?>? = Array?>?()" -// ); -// } -} diff --git a/test/org/jetbrains/jet/j2k/ast/AssertStatementTest.java b/test/org/jetbrains/jet/j2k/ast/AssertStatementTest.java deleted file mode 100644 index 9e397c9cba2..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/AssertStatementTest.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class AssertStatementTest extends JetTestCaseBase { - public void testOnlyCondition() throws Exception { - Assert.assertEquals( - statementToKotlin("assert boolMethod();"), - "assert {boolMethod()}" - ); - } - - public void testOnlyConditionWithBraces() throws Exception { - Assert.assertEquals( - statementToKotlin("assert(boolMethod());"), - "assert {(boolMethod())}" - ); - } - - public void testWithStringDetail() throws Exception { - Assert.assertEquals( - statementToKotlin("assert true : \"string details\";"), - "assert(\"string details\") {true}" - ); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/AssignmentExpressionTest.java b/test/org/jetbrains/jet/j2k/ast/AssignmentExpressionTest.java deleted file mode 100644 index 40e6470465a..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/AssignmentExpressionTest.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class AssignmentExpressionTest extends JetTestCaseBase { - public void testSimpleAssignment() throws Exception { - Assert.assertEquals(statementToSingleLineKotlin("i = 1;"), "i = 1"); - } - - public void testShiftRight() throws Exception { - Assert.assertEquals(expressionToKotlin("x >>= 2"), "x = (x shr 2)"); - } - - public void testShiftLeft() throws Exception { - Assert.assertEquals(expressionToKotlin("x <<= 2"), "x = (x shl 2)"); - } - - public void testUnsignedRightShift() throws Exception { - Assert.assertEquals(expressionToKotlin("x >>>= 2"), "x = x.cyclicShiftRight(2)"); - } - - public void testXor() throws Exception { - Assert.assertEquals(expressionToKotlin("x ^= 2"), "x = (x xor 2)"); - } - - public void testAnd() throws Exception { - Assert.assertEquals(expressionToKotlin("x &= 2"), "x = (x and 2)"); - } - - public void testOr() throws Exception { - Assert.assertEquals(expressionToKotlin("x |= 2"), "x = (x or 2)"); - } - - public void testMultiplyAssign() throws Exception { - Assert.assertEquals(expressionToKotlin("x *= 2"), "x *= 2"); - } - - public void testDivideAssign() throws Exception { - Assert.assertEquals(expressionToKotlin("x /= 2"), "x /= 2"); - } - - public void testPlusAssign() throws Exception { - Assert.assertEquals(expressionToKotlin("x += 2"), "x += 2"); - } - - public void testMinusAssign() throws Exception { - Assert.assertEquals(expressionToKotlin("x -= 2"), "x -= 2"); - } - - public void testReminder() throws Exception { - Assert.assertEquals(expressionToKotlin("x %= 2"), "x %= 2"); - } - - public void testAssignment() throws Exception { - Assert.assertEquals(expressionToKotlin("x = 2"), "x = 2"); - } -} \ No newline at end of file diff --git a/test/org/jetbrains/jet/j2k/ast/BinaryExpressionTest.java b/test/org/jetbrains/jet/j2k/ast/BinaryExpressionTest.java deleted file mode 100644 index d87c90c892a..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/BinaryExpressionTest.java +++ /dev/null @@ -1,81 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class BinaryExpressionTest extends JetTestCaseBase { - public void testMultiply() throws Exception { - Assert.assertEquals(expressionToKotlin("1 * 2"), "(1 * 2)"); - } - - public void testDivide() throws Exception { - Assert.assertEquals(expressionToKotlin("1 / 2"), "(1 / 2)"); - } - - public void testRemainder() throws Exception { - Assert.assertEquals(expressionToKotlin("1 % 2"), "(1 % 2)"); - } - - public void testPlus() throws Exception { - Assert.assertEquals(expressionToKotlin("1 + 2"), "(1 + 2)"); - } - - public void testMinus() throws Exception { - Assert.assertEquals(expressionToKotlin("1 - 2"), "(1 - 2)"); - } - - public void testLessThan() throws Exception { - Assert.assertEquals(expressionToKotlin("1 < 2"), "(1 < 2)"); - } - - public void testGreaterThan() throws Exception { - Assert.assertEquals(expressionToKotlin("1 > 2"), "(1 > 2)"); - } - - public void testLessThanEqual() throws Exception { - Assert.assertEquals(expressionToKotlin("1 <= 2"), "(1 <= 2)"); - } - - public void testGreaterThanEqual() throws Exception { - Assert.assertEquals(expressionToKotlin("1 >= 2"), "(1 >= 2)"); - } - - public void testConditionalAnd() throws Exception { - Assert.assertEquals(expressionToKotlin("true && false"), "(true && false)"); - } - - public void testConditionalOr() throws Exception { - Assert.assertEquals(expressionToKotlin("true || false"), "(true || false)"); - } - - public void testShiftRight() throws Exception { - Assert.assertEquals(expressionToKotlin("x >> 2"), "(x shr 2)"); - } - - public void testShiftLeft() throws Exception { - Assert.assertEquals(expressionToKotlin("x << 2"), "(x shl 2)"); - } - - public void testUnsignedRightShift() throws Exception { - Assert.assertEquals(expressionToKotlin("x >>> 2"), "x.cyclicShiftRight(2)"); - } - - public void testXor() throws Exception { - Assert.assertEquals(expressionToKotlin("x ^ 2"), "(x xor 2)"); - } - - public void testAnd() throws Exception { - Assert.assertEquals(expressionToKotlin("x & 2"), "(x and 2)"); - } - - public void testOr() throws Exception { - Assert.assertEquals(expressionToKotlin("x | 2"), "(x or 2)"); - } - -// public void testNot() throws Exception { // TODO: move to prefix -// Assert.assertEquals(expressionToKotlin("~x"), "inv(x)"); -// } -} diff --git a/test/org/jetbrains/jet/j2k/ast/BoxedTypeTest.java b/test/org/jetbrains/jet/j2k/ast/BoxedTypeTest.java deleted file mode 100644 index f9c58660380..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/BoxedTypeTest.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class BoxedTypeTest extends JetTestCaseBase { - public void testObject() throws Exception { - Assert.assertEquals(statementToKotlin("Object i = 10;"), "var i : Any? = 10"); - } - - public void testBoolean() throws Exception { - Assert.assertEquals(statementToKotlin("Boolean i = 10;"), "var i : Boolean? = 10"); - } - - public void testByte() throws Exception { - Assert.assertEquals(statementToKotlin("Byte i = 10;"), "var i : Byte? = 10"); - } - - public void testCharacter() throws Exception { - Assert.assertEquals(statementToKotlin("Character i = 10;"), "var i : Char? = 10"); - } - - public void testDouble() throws Exception { - Assert.assertEquals(statementToKotlin("Double i = 10;"), "var i : Double? = 10"); - } - - public void testFloat() throws Exception { - Assert.assertEquals(statementToKotlin("Float i = 10;"), "var i : Float? = 10"); - } - - public void testInteger() throws Exception { - Assert.assertEquals(statementToKotlin("Integer i = 10;"), "var i : Int? = 10"); - } - - public void testLong() throws Exception { - Assert.assertEquals(statementToKotlin("Long i = 10;"), "var i : Long? = 10"); - } - - public void testShort() throws Exception { - Assert.assertEquals(statementToKotlin("Short i = 10;"), "var i : Short? = 10"); - } - -// public void testNewInteger() throws Exception { -// Assert.assertEquals( -// statementToKotlin("Integer i = new Integer(10);"), -// "var i : Int? = Integer(10).toInt()" -// ); -// } -} diff --git a/test/org/jetbrains/jet/j2k/ast/BreakStatementTest.java b/test/org/jetbrains/jet/j2k/ast/BreakStatementTest.java deleted file mode 100644 index e8e7c8907a7..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/BreakStatementTest.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class BreakStatementTest extends JetTestCaseBase { - public void testBreakWithoutLabel() throws Exception { - Assert.assertEquals( - statementToSingleLineKotlin("break;"), - "break" - ); - } - - public void testBreakWithLabel() throws Exception { - Assert.assertEquals( - statementToSingleLineKotlin("break label;"), - "break@label" - ); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/ClassTest.java b/test/org/jetbrains/jet/j2k/ast/ClassTest.java deleted file mode 100644 index 907183b84eb..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/ClassTest.java +++ /dev/null @@ -1,152 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class ClassTest extends JetTestCaseBase { - public void testEmptyClass() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin("final class A {}"), - "class A { }" - ); - } - - public void testInnerEmptyClass() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin("final class A { inner final class B {} }"), - "class A { class B { } }" - ); - } - - public void testClassWithFields() throws Exception { - Assert.assertEquals(classToKotlin( - "final class T {" + - "String a = \"abc\";" + - "int b = 10;" + - "}"), - "class T {\n" + - "var a : String? = \"abc\"\n" + - "var b : Int = 10\n" + - "}"); - } - - public void testClassWithMultiplyFields() throws Exception { - Assert.assertEquals(classToKotlin( - "final class T {" + - "String a, b, c = \"abc\";" + - "}"), - "class T {\n" + - "var a : String?\n" + - "var b : String?\n" + - "var c : String? = \"abc\"\n" + - "}"); - } - - public void testClassWithEmptyMethods() throws Exception { - Assert.assertEquals(classToKotlin( - "final class T {" + - "void main() {}" + - "int i() {}" + - "String s() {}" + - "}" - ), - "class T {\n" + - "fun main() : Unit {\n" + - "}\n" + - "fun i() : Int {\n" + - "}\n" + - "fun s() : String? {\n" + - "}\n" + - "}"); - } - - public void testGenericClass() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin("final class Entry {}"), - "class Entry { }" - ); - } - - public void testSimpleInheritance() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin("final class A extends Base {}"), - "class A : Base { }" - ); - } - - public void testExtendsOneClassAndImplementsOneInterface() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin("final class A extends Base implements I {}"), - "class A : Base, I { }" - ); - } - - public void testExtendsOneClassAndImplementsSeveralInterfaces() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin("final class A extends Base implements I0, I1, I2 {}"), - "class A : Base, I0, I1, I2 { }" - ); - } - - public void testClass() throws Exception { - Assert.assertEquals(classToSingleLineKotlin("class Test {}"), "open class Test { }"); - } - - public void testFinalClass() throws Exception { - Assert.assertEquals(classToSingleLineKotlin("final class Test {}"), "class Test { }"); - } - - public void testPublicClass() throws Exception { - Assert.assertEquals(classToSingleLineKotlin("public class Test {}"), "public open class Test { }"); - } - - public void testProtectedClass() throws Exception { - Assert.assertEquals(classToSingleLineKotlin("protected class Test {}"), "protected open class Test { }"); - } - - public void testPivateClass() throws Exception { - Assert.assertEquals(classToSingleLineKotlin("private class Test {}"), "private open class Test { }"); - } - - public void testInternalClass() throws Exception { - Assert.assertEquals(classToSingleLineKotlin("class Test {}"), "open class Test { }"); - } - - public void testOneStaticMethod() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin("final class S { static boolean staticF() { return true; } }"), - "class S { class object { fun staticF() : Boolean { return true } } }" - ); - } - - public void testTwoStaticMethod() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin("final class S { static boolean sB() { return true; } static int sI() { return 1; } }"), - "class S { class object { fun sB() : Boolean { return true } fun sI() : Int { return 1 } } }" - ); - } - - public void testOneStaticMethodOneNonStatic() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin("final class S { boolean sB() { return true; } static int sI() { return 1; } }"), - "class S { class object { fun sI() : Int { return 1 } } fun sB() : Boolean { return true } }" - ); - } - - public void testOneStaticFieldOneNonStatic() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin("final class S { boolean sB() { return true; } static int myI = 10; }"), - "class S { class object { var myI : Int = 10 } fun sB() : Boolean { return true } }" - ); - } - - public void testInnerStaticClass() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin("final class S { static class Inner {} }"), - "class S { class object { open class Inner { } } }" - ); - } -} \ No newline at end of file diff --git a/test/org/jetbrains/jet/j2k/ast/ConditionalExpressionTest.java b/test/org/jetbrains/jet/j2k/ast/ConditionalExpressionTest.java deleted file mode 100644 index 9bbf599949b..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/ConditionalExpressionTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class ConditionalExpressionTest extends JetTestCaseBase { - public void testSimpleConditionalExpression() throws Exception { - Assert.assertEquals( - expressionToKotlin("a.isEmpty() ? 0 : 1"), - "(if (a.isEmpty())\n" + - "0\n" + - "else\n" + - "1)" - ); - } -} \ No newline at end of file diff --git a/test/org/jetbrains/jet/j2k/ast/ContinueStatementTest.java b/test/org/jetbrains/jet/j2k/ast/ContinueStatementTest.java deleted file mode 100644 index c7e62f4e123..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/ContinueStatementTest.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class ContinueStatementTest extends JetTestCaseBase { - public void testContinueWithoutLabel() throws Exception { - Assert.assertEquals( - statementToSingleLineKotlin("continue;"), - "continue" - ); - } - - public void testContinueWithLabel() throws Exception { - Assert.assertEquals( - statementToSingleLineKotlin("continue label;"), - "continue@label" - ); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/DeclarationStatementTest.java b/test/org/jetbrains/jet/j2k/ast/DeclarationStatementTest.java deleted file mode 100644 index 7ab8993a242..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/DeclarationStatementTest.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class DeclarationStatementTest extends JetTestCaseBase { - public void testSingleStringDeclaration() throws Exception { - Assert.assertEquals( - statementToSingleLineKotlin("String s;"), - "var s : String?" - ); - } - - public void testSingleIntDeclaration() throws Exception { - Assert.assertEquals( - statementToSingleLineKotlin("int s;"), - "var s : Int" - ); - } - - public void testMultiplyIntDeclaration() throws Exception { - Assert.assertEquals( - statementToKotlin("int k, l, m;"), - "var k : Int\n" + - "var l : Int\n" + - "var m : Int" - ); - } - - public void testSingleFinalStringDeclaration() throws Exception { - Assert.assertEquals( - statementToSingleLineKotlin("final String s;"), - "val s : String?" - ); - } - - public void testSingleFinalIntDeclaration() throws Exception { - Assert.assertEquals( - statementToSingleLineKotlin("final int s;"), - "val s : Int" - ); - } - - public void testMultiplyFinalIntDeclaration() throws Exception { - Assert.assertEquals( - statementToKotlin("final int k, l, m;"), - "val k : Int\n" + - "val l : Int\n" + - "val m : Int" - ); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/DoWhileStatementTest.java b/test/org/jetbrains/jet/j2k/ast/DoWhileStatementTest.java deleted file mode 100644 index a3ab333cda0..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/DoWhileStatementTest.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import org.jetbrains.jet.j2k.JetTestCaseBase; -import org.junit.Assert; - -/** - * @author ignatov - */ -public class DoWhileStatementTest extends JetTestCaseBase { - public void testWhileWithEmptyBlock() throws Exception { - Assert.assertEquals( - statementToKotlin("do {} while (true)"), - "do\n" + - "{\n" + - "}\n" + - "while (true)" - ); - } - - public void testWhileWithBlock() throws Exception { - Assert.assertEquals( - statementToKotlin("do {int i = 1; i = i + 1;} while (a > b)"), - "do\n" + - "{\n" + - "var i : Int = 1\n" + - "i = (i + 1)\n" + - "}\n" + - "while ((a > b))" - ); - } - - public void testWhileWithReturn() throws Exception { - Assert.assertEquals( - statementToKotlin("do return 1; while (true)"), - "do\nreturn 1\nwhile (true)" - ); - } - - public void testWhileWithExpression() throws Exception { - Assert.assertEquals( - statementToKotlin("do i = i + 1; while (true)"), - "do\ni = (i + 1)\nwhile (true)" - ); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/EnumTest.java b/test/org/jetbrains/jet/j2k/ast/EnumTest.java deleted file mode 100644 index b7de6a939ec..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/EnumTest.java +++ /dev/null @@ -1,159 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class EnumTest extends JetTestCaseBase { - public void testEmptyEnum() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin("enum A {}"), - "enum A { }" - ); - } - - public void testTypeSafeEnum() throws Exception { - Assert.assertEquals( - classToKotlin("enum Coin { PENNY, NICKEL, DIME, QUARTER; }"), - "enum Coin {\n" + - "PENNY\n" + - "NICKEL\n" + - "DIME\n" + - "QUARTER\n" + - "}" - ); - } - - public void testOverrideToString() throws Exception { - Assert.assertEquals( - classToKotlin( - "enum Color {" + - " WHITE, BLACK, RED, YELLOW, BLUE;" + - "@Override String toString() {" + - " return \"COLOR\";" + - "}" + - "}"), - "enum Color {\n" + - "WHITE\n" + - "BLACK\n" + - "RED\n" + - "YELLOW\n" + - "BLUE\n" + - "override fun toString() : String? {\n" + - "return \"COLOR\"\n" + - "}\n" + - "}" - ); - } - - public void testFieldsWithPrimaryPrivateConstructor() throws Exception { - Assert.assertEquals( - classToKotlin( - "enum Color {\n" + - " WHITE(21), BLACK(22), RED(23), YELLOW(24), BLUE(25);\n" + - "\n" + - " private int code;\n" + - "\n" + - " private Color(int c) {\n" + - " code = c;\n" + - " }\n" + - "\n" + - " public int getCode() {\n" + - " return code;\n" + - " }"), - "enum Color {\n" + - "WHITE(21)\n" + - "BLACK(22)\n" + - "RED(23)\n" + - "YELLOW(24)\n" + - "BLUE(25)\n" + - "private var code : Int\n" + - "private (c : Int) {\n" + - "code = c\n" + - "}\n" + - "public fun getCode() : Int {\n" + - "return code\n" + - "}\n" + - "}" - ); - } - - public void testEnumImplementsOneInterface() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin("enum A implements I {}"), - "enum A : I { }" - ); - } - - public void testEnumWithNameField() throws Exception { - Assert.assertEquals( - classToKotlin("enum E { I; private String name; }"), - "enum E {\nI\nprivate var name : String?\n}" - ); - } - - public void testEnumImplementsSeveralInterfaces() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin("enum A implements I0, I1, I2 {}"), - "enum A : I0, I1, I2 { }" - ); - } - - public void testPublicEnum() throws Exception { - Assert.assertEquals(classToSingleLineKotlin("public enum Test {}"), "public enum Test { }"); - } - - public void testProtectedEnum() throws Exception { - Assert.assertEquals(classToSingleLineKotlin("protected enum Test {}"), "protected enum Test { }"); - } - - public void testPrivateEnum() throws Exception { - Assert.assertEquals(classToSingleLineKotlin("private enum Test {}"), "private enum Test { }"); - } - - public void testInternalEnum() throws Exception { - Assert.assertEquals(classToSingleLineKotlin("enum Test {}"), "enum Test { }"); - } - -// public void testTwoConstructors() throws Exception { -// Assert.assertEquals( -// classToKotlin( -// "enum MultEnum {\n" + -// " GREMLIN(\"UTILITY\"),\n" + -// " MORT(30);\n" + -// " \n" + -// " MultEnum(String s) {\n" + -// " }\n" + -// " \n" + -// " MultEnum(int dmg) {\n" + -// " }"), -// "" // TODO: will fail -// ); -// } - - public void testRunnableImplementation() throws Exception { - Assert.assertEquals( - classToKotlin( - "enum Color implements Runnable {\n" + - " WHITE, BLACK, RED, YELLOW, BLUE;\n" + - "\n" + - " public void run() {\n" + - " System.out.println(\"name()=\" + name() +\n" + - " \", toString()=\" + toString());\n" + - " }\n" + - "}"), - "enum Color : Runnable {\n" + - "WHITE\n" + - "BLACK\n" + - "RED\n" + - "YELLOW\n" + - "BLUE\n" + - "override public fun run() : Unit {\n" + - "System.out.println((\"name()=\" + name() + \", toString()=\" + toString()))\n" + - "}\n" + - "}" - ); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/FieldTest.java b/test/org/jetbrains/jet/j2k/ast/FieldTest.java deleted file mode 100644 index 4be8af966fc..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/FieldTest.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class FieldTest extends JetTestCaseBase { - public void testVarWithoutInit() throws Exception { - Assert.assertEquals( - methodToSingleLineKotlin("Foo f;"), - "var f : Foo?" - ); - } - - public void testVarWithInit() throws Exception { - Assert.assertEquals( - methodToSingleLineKotlin("Foo f = new Foo(1, 2);"), - "var f : Foo? = Foo(1, 2)" - ); - } - - public void testValWithInit() throws Exception { - Assert.assertEquals( - methodToSingleLineKotlin("final Foo f = new Foo(1, 2);"), - "val f : Foo? = Foo(1, 2)" - ); - } - - public void testPrivateField() throws Exception { - Assert.assertEquals(methodToSingleLineKotlin("private Foo f;"), "private var f : Foo?"); - } - - public void testProtectedField() throws Exception { - Assert.assertEquals(methodToSingleLineKotlin("protected Foo f;"), "protected var f : Foo?"); - } - - public void testPublicField() throws Exception { - Assert.assertEquals(methodToSingleLineKotlin("public Foo f;"), "public var f : Foo?"); - } - - public void testInternalField() throws Exception { - Assert.assertEquals(methodToSingleLineKotlin("Foo f;"), "var f : Foo?"); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/FileTest.java b/test/org/jetbrains/jet/j2k/ast/FileTest.java deleted file mode 100644 index 75d5a05a6da..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/FileTest.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class FileTest extends JetTestCaseBase { - public void testPackageWithImports() throws Exception { - Assert.assertEquals( - fileToKotlin( - "package test;" + - "import ast;" + - "import ast2;"), - "namespace test {" + "\n" + - "import ast" + "\n" + - "import ast2" + "\n" + - "}" - ); - } - - public void testPackageWithMixedImports() throws Exception { - Assert.assertEquals( - fileToKotlin( - "package test;" + - "import static ast;" + - "import ast2;"), - "namespace test {" + "\n" + - "import ast" + "\n" + - "import ast2" + "\n" + - "}" - ); - } - - public void testPackageWithStaticImports() throws Exception { - Assert.assertEquals( - fileToKotlin( - "package test;" + - "import static ast;" + - "import static ast2;"), - "namespace test {" + "\n" + - "import ast" + "\n" + - "import ast2" + "\n" + - "}" - ); - } - - public void testPackageWithClass() throws Exception { - Assert.assertEquals( - toSingleLine(fileToKotlin("package test; final class C {}")), - "namespace test { class C { } }" - ); - } - - public void testPackageWithOpenClass() throws Exception { - Assert.assertEquals( - toSingleLine(fileToKotlin("package test; class C {}")), - "namespace test { open class C { } }" - ); - } - - public void testPackageWithClasses() throws Exception { - Assert.assertEquals( - toSingleLine(fileToKotlin("final class A {} final class B {}")), - "namespace { class A { } class B { } }"); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/ForTest.java b/test/org/jetbrains/jet/j2k/ast/ForTest.java deleted file mode 100644 index 0ff18e98229..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/ForTest.java +++ /dev/null @@ -1,115 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class ForTest extends JetTestCaseBase { - public void testCommonCaseForTest() throws Exception { - Assert.assertEquals( - statementToKotlin("for (init(); condition(); update()) body();"), - "{\n" + - "init()\n" + - "while (condition())\n" + - "{\n" + - "body()\n" + - "{\n" + - "update()\n" + - "}\n" + - "}\n" + - "}" - ); - } - - public void testForWithEmptyBlock() throws Exception { - Assert.assertEquals( - statementToKotlin("for (int i = 0; i < 0; j++, i++) {}"), - "{\n" + - "var i : Int = 0\n" + - "while ((i < 0))\n" + - "{\n" + - "{\n" + - "}\n" + - "{\n" + - "(j++)\n" + - "(i++)\n" + - "}\n" + - "}\n" + - "}" - ); - } - - public void testForWithBlock() throws Exception { - Assert.assertEquals( - statementToKotlin("for (int i = 0; i < 0; i++) {int i = 1; i++;}"), - "{\n" + - "var i : Int = 0\n" + - "while ((i < 0))\n" + - "{\n" + - "{\n" + - "var i : Int = 1\n" + - "(i++)\n" + - "}\n" + - "{\n" + - "(i++)\n" + - "}\n" + - "}\n" + - "}" - ); - } - - public void testForWithBlockAndDoubleUpdate() throws Exception { - Assert.assertEquals( - statementToKotlin("for (int i = 0; i < 0; j++, i++) {int i = 1; i++;}"), - "{\n" + - "var i : Int = 0\n" + - "while ((i < 0))\n" + - "{\n" + - "{\n" + - "var i : Int = 1\n" + - "(i++)\n" + - "}\n" + - "{\n" + - "(j++)\n" + - "(i++)\n" + - "}\n" + - "}\n" + - "}" - ); - } - - public void testForWithReturn() throws Exception { - Assert.assertEquals( - statementToKotlin("for (int i = 0; i < 0; j++, i++) return i;"), - "{\n" + - "var i : Int = 0\n" + - "while ((i < 0))\n" + - "{\n" + - "return i\n" + - "{\n" + - "(j++)\n" + - "(i++)\n" + - "}\n" + - "}\n" + - "}" - ); - } - - public void testForWithExpression() throws Exception { - Assert.assertEquals( - statementToKotlin("for (int i = 0; i < 0; i++) t++;"), - "{\n" + - "var i : Int = 0\n" + - "while ((i < 0))\n" + - "{\n" + - "(t++)\n" + - "{\n" + - "(i++)\n" + - "}\n" + - "}\n" + - "}" - ); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/ForeachStatementTest.java b/test/org/jetbrains/jet/j2k/ast/ForeachStatementTest.java deleted file mode 100644 index d283c806c11..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/ForeachStatementTest.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class ForeachStatementTest extends JetTestCaseBase { - public void testEnhancedForWithEmptyBlock() throws Exception { - Assert.assertEquals( - statementToKotlin("for (Node n : list) {}"), - "for (n : Node? in list)\n{\n" + "}" - ); - } - - public void testEnhancedForWithBlock() throws Exception { - Assert.assertEquals( - statementToKotlin("for (Node n : list) {int i = 1; i++;}"), - "for (n : Node? in list)\n" + - "{\n" + - "var i : Int = 1\n" + - "(i++)\n" + - "}" - ); - } - - public void testEnhancedForWithReturn() throws Exception { - Assert.assertEquals( - statementToKotlin("for (Node n : list) return n;"), - "for (n : Node? in list)\nreturn n" - ); - } - - public void testEnhancedForWithExpression() throws Exception { - Assert.assertEquals( - statementToKotlin("for (Node n : list) i++;"), - "for (n : Node? in list)\n(i++)" - ); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/FunctionTest.java b/test/org/jetbrains/jet/j2k/ast/FunctionTest.java deleted file mode 100644 index 145d874009d..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/FunctionTest.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class FunctionTest extends JetTestCaseBase { - public void testEmptyVoidMethod() throws Exception { - Assert.assertEquals( - methodToSingleLineKotlin("void main() {}"), - "fun main() : Unit { }" - ); - } - - public void testMethodClassType() throws Exception { - Assert.assertEquals( - methodToSingleLineKotlin("String main() {}"), - "fun main() : String? { }" - ); - } - - public void testMethodPrimitiveType() throws Exception { - Assert.assertEquals( - methodToSingleLineKotlin("int main() {}"), - "fun main() : Int { }" - ); - } - - public void testMethodPrimitiveType2() throws Exception { - Assert.assertEquals( - methodToSingleLineKotlin("boolean main() {}"), - "fun main() : Boolean { }" - ); - } - - public void testMethodWithReturnStatement() throws Exception { - Assert.assertEquals( - methodToSingleLineKotlin("boolean isTrue() { return true; }"), - "fun isTrue() : Boolean { return true }" - ); - } - - public void testClassGenericParam() throws Exception { - Assert.assertEquals( - methodToSingleLineKotlin("T getT() {}"), - "fun getT() : T? { }" - ); - } - - public void testOwnGenericParam() throws Exception { - Assert.assertEquals( - methodToSingleLineKotlin(" void putU(U u) {}"), - "fun putU(u : U?) : Unit { }" - ); - } - - public void testOwnSeveralGenericParams() throws Exception { - Assert.assertEquals( - methodToSingleLineKotlin(" void putUVW(U u, V v, W w) {}"), - "fun putUVW(u : U?, v : V?, w : W?) : Unit { }" - ); - } - - public void testInternal() throws Exception { - Assert.assertEquals(methodToSingleLineKotlin("void test() {}"), "fun test() : Unit { }"); - } - - public void testPrivate() throws Exception { - Assert.assertEquals(methodToSingleLineKotlin("private void test() {}"), "private fun test() : Unit { }"); - } - - public void testProtected() throws Exception { - Assert.assertEquals(methodToSingleLineKotlin("protected void test() {}"), "protected fun test() : Unit { }"); - } - - public void testPublic() throws Exception { - Assert.assertEquals(methodToSingleLineKotlin("public void test() {}"), "public fun test() : Unit { }"); - } - - public void testOverride() throws Exception { - Assert.assertEquals(fileToSingleLineKotlin("class A {void a() {}} final class B extends A {void a() {}}"), - "namespace { open class A { fun a() : Unit { } } class B : A { override fun a() : Unit { } } }"); - } - -} \ No newline at end of file diff --git a/test/org/jetbrains/jet/j2k/ast/IdentifierImplTest.java b/test/org/jetbrains/jet/j2k/ast/IdentifierImplTest.java deleted file mode 100644 index 9b5dd9aff52..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/IdentifierImplTest.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.TestCase; - -/** - * @author ignatov - */ -public class IdentifierImplTest extends TestCase { - public void testEmpty() throws Exception { // TODO: remove - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/IfStatementTest.java b/test/org/jetbrains/jet/j2k/ast/IfStatementTest.java deleted file mode 100644 index 7f08d3d871a..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/IfStatementTest.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class IfStatementTest extends JetTestCaseBase { - public void testIfStatementWithOneLineBlocks() throws Exception { - Assert.assertEquals( - statementToKotlin("if (true) return 1; else return 0;"), - "if (true)\n" + - "return 1\n" + - "else\n" + - "return 0" - ); - } - - public void testIfStatementWithMultilineBlocks() throws Exception { - Assert.assertEquals( - statementToKotlin("if (1 > 0) {int n = 1; return n;} else {return 0;}"), - "if ((1 > 0))\n" + - "{\n" + - "var n : Int = 1\n" + - "return n\n" + - "}\n" + - "else\n" + - "{\n" + - "return 0\n" + - "}" - ); - } - - public void testIfStatementWithoutElse() throws Exception { - Assert.assertEquals( - statementToKotlin("if (1 > 0) {int n = 1; return n;}"), - "if ((1 > 0))\n" + - "{\n" + - "var n : Int = 1\n" + - "return n\n" + - "}" - ); - } - - public void testIfStatementWithEmptyBlocks() throws Exception { - Assert.assertEquals( - statementToKotlin("if (1 > 0) {} else {}"), - "if ((1 > 0))\n" + - "{\n" + - "}\n" + - "else\n" + - "{\n" + - "}" - ); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/InProjectionTypeTest.java b/test/org/jetbrains/jet/j2k/ast/InProjectionTypeTest.java deleted file mode 100644 index e5bf07095f6..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/InProjectionTypeTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class InProjectionTypeTest extends JetTestCaseBase { - public void testMethodParams() throws Exception { - Assert.assertEquals( - methodToSingleLineKotlin("void popAll(Collection dst) {}"), - "fun popAll(dst : Collection?) : Unit { }" - ); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/IsOperatorTest.java b/test/org/jetbrains/jet/j2k/ast/IsOperatorTest.java deleted file mode 100644 index 76e7ce2b0fc..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/IsOperatorTest.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class IsOperatorTest extends JetTestCaseBase { - public void testSimpleReference() throws Exception { - Assert.assertEquals( - expressionToKotlin("a instanceof String"), - "(a is String?)" - ); - } - - public void testComplicatedExpression() throws Exception { - Assert.assertEquals( - expressionToKotlin("c.getType().getName() instanceof String"), - "(c.getType().getName() is String?)" - ); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/LabelStatementTest.java b/test/org/jetbrains/jet/j2k/ast/LabelStatementTest.java deleted file mode 100644 index a6c0cc99468..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/LabelStatementTest.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class LabelStatementTest extends JetTestCaseBase { - public void testComplicatedExampleFromJavaTutorial() throws Exception { - Assert.assertEquals( - statementToKotlin( - " test:" + - " for (int i = 0; i <= max; i++) {" + - " int n = substring.length();" + - " int j = i;" + - " int k = 0;" + - " while (n-- != 0) {" + - " if (searchMe.charAt(j++) != substring.charAt(k++)) {" + - " continue test;" + - " }" + - " } " + - " foundIt = true;" + - " break test;" + - " }" + - " System.out.println(foundIt ? \"Found it\" : \"Didn't find it\");" + - " }" + - "}"), - "@test {\n" + - "var i : Int = 0\n" + - "while ((i <= max))\n" + - "{\n" + - "{\n" + - "var n : Int = substring.length()\n" + - "var j : Int = i\n" + - "var k : Int = 0\n" + - "while (((n--) != 0))\n" + - "{\n" + - "if ((searchMe.charAt((j++)) != substring.charAt((k++))))\n" + - "{\n" + - "continue@test\n" + - "}\n" + - "}\n" + - "foundIt = true\n" + - "break@test\n" + - "}\n" + - "{\n" + - "(i++)\n" + - "}\n" + - "}\n" + - "}\n" + - "System.out.println((if (foundIt)\n" + - "\"Found it\"\n" + - "else\n" + - "\"Didn't find it\"))" - ); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/LocalVariableTest.java b/test/org/jetbrains/jet/j2k/ast/LocalVariableTest.java deleted file mode 100644 index fc056e3790e..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/LocalVariableTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class LocalVariableTest extends JetTestCaseBase { - public void testObject() throws Exception { - Assert.assertEquals( - statementToSingleLineKotlin("int i;"), - "var i : Int" - ); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/MethodCallExpressionTest.java b/test/org/jetbrains/jet/j2k/ast/MethodCallExpressionTest.java deleted file mode 100644 index 76d11053c28..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/MethodCallExpressionTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class MethodCallExpressionTest extends JetTestCaseBase { - public void testSimpleCall() throws Exception { - Assert.assertEquals( - statementToSingleLineKotlin("method(param1, param2);"), "method(param1, param2)" - ); - } - - public void testEmptyCall() throws Exception { - Assert.assertEquals( - statementToSingleLineKotlin("methodCall();"), "methodCall()" - ); - } - - public void testCallWithKeywords() throws Exception { - Assert.assertEquals( - statementToSingleLineKotlin("when(open, trait);"), "`when`(`open`, `trait`)" - ); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/NewClassExpressionTest.java b/test/org/jetbrains/jet/j2k/ast/NewClassExpressionTest.java deleted file mode 100644 index 78df5a362ef..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/NewClassExpressionTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class NewClassExpressionTest extends JetTestCaseBase { - public void testClassWithoutBody() throws Exception { - Assert.assertEquals(expressionToSingleLineKotlin("new Foo();"), "Foo()"); - } - - public void testClassWithoutBody2() throws Exception { - Assert.assertEquals(expressionToSingleLineKotlin("new myApp.Foo();"), "myApp.Foo()"); - } - - public void testClassWithParam() throws Exception { - Assert.assertEquals(expressionToSingleLineKotlin("new Foo(param);"), "Foo(param)"); - } - - public void testClassWithParams() throws Exception { - Assert.assertEquals(expressionToSingleLineKotlin("new Foo(param1, param2);"), "Foo(param1, param2)"); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/OutProjectionTypeTest.java b/test/org/jetbrains/jet/j2k/ast/OutProjectionTypeTest.java deleted file mode 100644 index 2475d11c506..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/OutProjectionTypeTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class OutProjectionTypeTest extends JetTestCaseBase { - public void testMethodParams() throws Exception { - Assert.assertEquals( - methodToSingleLineKotlin("void pushAll(Collection src) {}"), - "fun pushAll(src : Collection?) : Unit { }" - ); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/ParenthesizedExpressionTest.java b/test/org/jetbrains/jet/j2k/ast/ParenthesizedExpressionTest.java deleted file mode 100644 index 22b90d535a6..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/ParenthesizedExpressionTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class ParenthesizedExpressionTest extends JetTestCaseBase { - public void testParenthesized() throws Exception { - Assert.assertEquals(expressionToSingleLineKotlin("(1 + 2)"), "((1 + 2))"); - } - - public void testParenthesized2() throws Exception { - Assert.assertEquals(expressionToSingleLineKotlin("(o.toString() + \"abc\")"), "((o.toString() + \"abc\"))"); - } -} \ No newline at end of file diff --git a/test/org/jetbrains/jet/j2k/ast/PolyadicExpressionTest.java b/test/org/jetbrains/jet/j2k/ast/PolyadicExpressionTest.java deleted file mode 100644 index c707c50870d..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/PolyadicExpressionTest.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class PolyadicExpressionTest extends JetTestCaseBase { - public void testMultiply() throws Exception { - Assert.assertEquals(expressionToKotlin("1 * 2 * 3"), "(1 * 2 * 3)"); - } - - public void testDivide() throws Exception { - Assert.assertEquals(expressionToKotlin("1 / 2 / 3"), "(1 / 2 / 3)"); - } - - public void testRemainder() throws Exception { - Assert.assertEquals(expressionToKotlin("1 % 2 % 3"), "(1 % 2 % 3)"); - } - - public void testPlus() throws Exception { - Assert.assertEquals(expressionToKotlin("1 + 2 + 3"), "(1 + 2 + 3)"); - } - - public void testMinus() throws Exception { - Assert.assertEquals(expressionToKotlin("1 - 2 - 3"), "(1 - 2 - 3)"); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/PostfixOperatorTest.java b/test/org/jetbrains/jet/j2k/ast/PostfixOperatorTest.java deleted file mode 100644 index ac81dc2f0a6..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/PostfixOperatorTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class PostfixOperatorTest extends JetTestCaseBase { - public void testIncrement() throws Exception { - Assert.assertEquals(statementToKotlin("i++;"), "(i++)"); - } - - public void testDecrement() throws Exception { - Assert.assertEquals(statementToKotlin("i--;"), "(i--)"); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/PrefixOperatorTest.java b/test/org/jetbrains/jet/j2k/ast/PrefixOperatorTest.java deleted file mode 100644 index 27f312f2fe4..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/PrefixOperatorTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class PrefixOperatorTest extends JetTestCaseBase { - public void testIncrement() throws Exception { - Assert.assertEquals(statementToKotlin("++i;"), "(++i)"); - } - - public void testDecrement() throws Exception { - Assert.assertEquals(statementToKotlin("--i;"), "(--i)"); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/ReturnStatementTest.java b/test/org/jetbrains/jet/j2k/ast/ReturnStatementTest.java deleted file mode 100644 index 92fce59b4e4..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/ReturnStatementTest.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class ReturnStatementTest extends JetTestCaseBase { - public void testReturnLiteral() throws Exception { - Assert.assertEquals( - statementToSingleLineKotlin("return true;"), - "return true" - ); - } - - public void testReturnString() throws Exception { - Assert.assertEquals( - statementToSingleLineKotlin("return \"str\";"), - "return \"str\"" - ); - } - - public void testReturnNumber() throws Exception { - Assert.assertEquals( - statementToSingleLineKotlin("return 1;"), - "return 1" - ); - } - - public void testReturnChar() throws Exception { - Assert.assertEquals( - statementToSingleLineKotlin("return 'c';"), - "return 'c'" - ); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/StarProjectionTypeTest.java b/test/org/jetbrains/jet/j2k/ast/StarProjectionTypeTest.java deleted file mode 100644 index bd4ac8cae14..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/StarProjectionTypeTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class StarProjectionTypeTest extends JetTestCaseBase { - public void testMethodParams() throws Exception { - Assert.assertEquals( - methodToSingleLineKotlin("void wtf(Collection w) {}"), - "fun wtf(w : Collection<*>?) : Unit { }" - ); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/SynchronizedStatementTest.java b/test/org/jetbrains/jet/j2k/ast/SynchronizedStatementTest.java deleted file mode 100644 index 2d353b8af23..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/SynchronizedStatementTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class SynchronizedStatementTest extends JetTestCaseBase { - public void testSingleLineExample() throws Exception { - Assert.assertEquals( - statementToSingleLineKotlin("synchronized (s) { doSomething(s); }"), - "synchronized (s) { doSomething(s) }" - ); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/ThrowStatementTest.java b/test/org/jetbrains/jet/j2k/ast/ThrowStatementTest.java deleted file mode 100644 index 570c7b360ee..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/ThrowStatementTest.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class ThrowStatementTest extends JetTestCaseBase { - public void testSimpleThrowStatement() throws Exception { - Assert.assertEquals( - statementToSingleLineKotlin("throw exception;"), "throw exception"); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/TraitTest.java b/test/org/jetbrains/jet/j2k/ast/TraitTest.java deleted file mode 100644 index 03966099193..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/TraitTest.java +++ /dev/null @@ -1,95 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class TraitTest extends JetTestCaseBase { - public void testEmptyInterface() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin("interface A {}"), - "trait A { }" - ); - } - - public void testInterfaceWithMethodDeclaration() throws Exception { - Assert.assertEquals(classToKotlin( - "interface INode {" + - "Tag getTag();" + - "String toKotlin();" + - "}" - ), - "trait INode {\n" + - "public fun getTag() : Tag? \n" + - "public fun toKotlin() : String? \n" + - "}"); - } - - public void testInterfaceWithFields() throws Exception { - Assert.assertEquals(classToKotlin( - "interface INode {" + - "String IN = \"in\";" + - "String AT = \"@\";" + - "String COMMA_WITH_SPACE = COMMA + SPACE;" + - "}" - ), - "trait INode {\n" + - "class object {\n" + - "public val IN : String? = \"in\"\n" + - "public val AT : String? = \"@\"\n" + - "public val COMMA_WITH_SPACE : String? = (COMMA + SPACE)\n" + - "}\n" + - "}" - ); - } - - public void testExtendsOneInterface() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin("interface A extends I {}"), - "trait A : I { }" - ); - } - - public void testExtendsOneClassAndImplementsSeveralInterfaces() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin("interface A extends I0, I1, I2 {}"), - "trait A : I0, I1, I2 { }" - ); - } - - public void testPublicInterface() throws Exception { - Assert.assertEquals(classToSingleLineKotlin("public interface Test {}"), "public trait Test { }"); - } - - public void testProtectedInterface() throws Exception { - Assert.assertEquals(classToSingleLineKotlin("protected interface Test {}"), "protected trait Test { }"); - } - - public void testPrivateInterface() throws Exception { - Assert.assertEquals(classToSingleLineKotlin("private interface Test {}"), "private trait Test { }"); - } - - public void testInternalInterface() throws Exception { - Assert.assertEquals(classToSingleLineKotlin("interface Test {}"), "trait Test { }"); - } - - public void testInterfaceWithStaticFields() throws Exception { - Assert.assertEquals(classToKotlin( - "public interface INode {" + - " public static final String IN = \"in\";" + - " public static final String AT = \"@\";" + - " public static final String COMMA_WITH_SPACE = COMMA + SPACE;" + - "}" - ), - "public trait INode {\n" + - "class object {\n" + - "public val IN : String? = \"in\"\n" + - "public val AT : String? = \"@\"\n" + - "public val COMMA_WITH_SPACE : String? = (COMMA + SPACE)\n" + - "}\n" + - "}" - ); - } -} \ No newline at end of file diff --git a/test/org/jetbrains/jet/j2k/ast/TryStatementTest.java b/test/org/jetbrains/jet/j2k/ast/TryStatementTest.java deleted file mode 100644 index e0cea4cdb49..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/TryStatementTest.java +++ /dev/null @@ -1,111 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class TryStatementTest extends JetTestCaseBase { - public void testEmptyTryWithTwoCatchesWithoutFinally() throws Exception { - Assert.assertEquals( - statementToKotlin( - "try {" + - "} catch (Exception e) {" + - " println(1);" + - "} catch (IOException e) {" + - " println(0);" + - "}"), - "try\n" + - "{\n" + - "}\n" + - "catch (e : Exception?) {\n" + - "println(1)\n" + - "}\n" + - "catch (e : IOException?) {\n" + - "println(0)\n" + - "}" - ); - } - - public void testEmptyTryWithTwoCatchesWithEmptyFinally() throws Exception { - Assert.assertEquals( - statementToKotlin( - "try {" + - "} catch (Exception e) {" + - " println(1);" + - "} catch (IOException e) {" + - " println(0);" + - "} finally {}"), - "try\n" + - "{\n" + - "}\n" + - "catch (e : Exception?) {\n" + - "println(1)\n" + - "}\n" + - "catch (e : IOException?) {\n" + - "println(0)\n" + - "}\n" + - "finally\n" + - "{\n" + - "}" - ); - } - - public void testEmptyTryWithTwoCatchesWithFinally() throws Exception { - Assert.assertEquals( - statementToKotlin( - "try {" + - "} catch (Exception e) {" + - " println(1);" + - "} catch (IOException e) {" + - " println(0);" + - "} finally {" + - " println(3);" + - "}"), - "try\n" + - "{\n" + - "}\n" + - "catch (e : Exception?) {\n" + - "println(1)\n" + - "}\n" + - "catch (e : IOException?) {\n" + - "println(0)\n" + - "}\n" + - "finally\n" + - "{\n" + - "println(3)\n" + - "}" - ); - } - - public void testCommonCaseForTryStatement() throws Exception { - Assert.assertEquals( - statementToKotlin( - "try {" + - " callMethod(params);" + - "} catch (Exception e) {" + - " println(1);" + - "} catch (IOException e) {" + - " println(0);" + - "} finally {" + - " println(3);" + - "}"), - "try\n" + - "{\n" + - "callMethod(params)\n" + - "}\n" + - "catch (e : Exception?) {\n" + - "println(1)\n" + - "}\n" + - "catch (e : IOException?) {\n" + - "println(0)\n" + - "}\n" + - "finally\n" + - "{\n" + - "println(3)\n" + - "}" - ); - } - -} diff --git a/test/org/jetbrains/jet/j2k/ast/TypeCastExpressionTest.java b/test/org/jetbrains/jet/j2k/ast/TypeCastExpressionTest.java deleted file mode 100644 index 71e41ec4dfc..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/TypeCastExpressionTest.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class TypeCastExpressionTest extends JetTestCaseBase { - public void testStringCast() throws Exception { - Assert.assertEquals( - expressionToKotlin("(String)t"), - "(t as String?)" - ); - } - - public void testIntCast() throws Exception { - Assert.assertEquals( - expressionToKotlin("(int)t"), - "(t as Int)" - ); - } - - public void testFooCast() throws Exception { - Assert.assertEquals( - expressionToKotlin("(Foo)t"), - "(t as Foo?)" - ); - } - - public void testPrimitiveType() throws Exception { - Assert.assertEquals( - expressionToKotlin("(int)100.00;"), - "(100.00 as Int)" - ); - } - - public void testSimpleGenericCast() throws Exception { - Assert.assertEquals( - expressionToKotlin("(List)list"), - "(list as List?)" - ); - } - - public void testExtendsWildcardCast() throws Exception { - Assert.assertEquals( - expressionToKotlin("(List)list"), - "(list as List?)" - ); - } - - public void testSuperWildcardCast() throws Exception { - Assert.assertEquals( - expressionToKotlin("(List)list"), - "(list as List?)" - ); - } - - public void testWildcardCast() throws Exception { - Assert.assertEquals( - expressionToKotlin("(List)list"), - "(list as List<*>?)" - ); - } -} \ No newline at end of file diff --git a/test/org/jetbrains/jet/j2k/ast/TypeParametersTest.java b/test/org/jetbrains/jet/j2k/ast/TypeParametersTest.java deleted file mode 100644 index 62ff6346b73..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/TypeParametersTest.java +++ /dev/null @@ -1,91 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class TypeParametersTest extends JetTestCaseBase { - public void testGenericParam() throws Exception { - Assert.assertEquals( - statementToKotlin("List l;"), - "var l : List?" - ); - } - - public void testManyGenericParams() throws Exception { - Assert.assertEquals( - statementToKotlin("List l;"), - "var l : List?" - ); - } - - public void testWhere() throws Exception { - Assert.assertEquals( - methodToSingleLineKotlin( - "> T max(Collection coll) {}"), - "fun max(coll : Collection?) : T? where T : Comparable? { }" - ); - } - - public void testMethodDoubleParametrizationWithTwoBounds() throws Exception { - Assert.assertEquals( - methodToSingleLineKotlin( - ", K extends Node & Collection> T max(Collection coll) {}"), - "fun max(coll : Collection?) : T? where T : Comparable?, K : Collection? { }" - ); - } - - public void testClassDoubleParametrizationWithTwoBoundsWithExtending() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin("final class CC , K extends Node & Collection> extends A {}"), - "class CC : A where T : Comparable?, K : Collection? { }" - ); - } - - public void testTraitDoubleParametrizationWithTwoBoundsWithExtending() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin( - "interface I , K extends Node & Collection> extends II {}"), - "trait I : II where T : Comparable?, K : Collection? { }" - ); - } - - public void testGenericClass() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin("final class Comparable {}"), - "class Comparable { }" - ); - } - - public void testComplexExampleWithClassExtending() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin( - "interface CommandHandler {}"), - "trait CommandHandler { }" - ); - } - - public void testClassParametrizationWithTwoBounds() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin("final class C> {}"), - "class C where T : Comparable? { }" - ); - } - - public void testClassParametrizationWithTwoBoundsWithExtending() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin("final class C> extends A {}"), - "class C : A where T : Comparable? { }" - ); - } - - public void testComplexExampleWithClassMultiplyExtending() throws Exception { - Assert.assertEquals( - classToSingleLineKotlin( - "interface CommandHandler {}"), - "trait CommandHandler { }" - ); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/VarArgTest.java b/test/org/jetbrains/jet/j2k/ast/VarArgTest.java deleted file mode 100644 index fc3d43f1053..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/VarArgTest.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class VarArgTest extends JetTestCaseBase { - public void testEllipsisTypeSingleParams() throws Exception { - Assert.assertEquals( - methodToSingleLineKotlin("void pushAll(Object... objs) {}"), - "fun pushAll(vararg objs : Any?) : Unit { }" - ); - } - - public void testEllipsisTypeSeveralParams() throws Exception { - Assert.assertEquals( - methodToSingleLineKotlin("String format(String pattern, Object... arguments);"), - "fun format(pattern : String?, vararg arguments : Any?) : String?" - ); - } -} diff --git a/test/org/jetbrains/jet/j2k/ast/WhileStatementTest.java b/test/org/jetbrains/jet/j2k/ast/WhileStatementTest.java deleted file mode 100644 index 838efc36cb3..00000000000 --- a/test/org/jetbrains/jet/j2k/ast/WhileStatementTest.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.jetbrains.jet.j2k.ast; - -import junit.framework.Assert; -import org.jetbrains.jet.j2k.JetTestCaseBase; - -/** - * @author ignatov - */ -public class WhileStatementTest extends JetTestCaseBase { - public void testWhileWithEmptyBlock() throws Exception { - Assert.assertEquals( - statementToKotlin("while (true) {}"), - "while (true)\n{\n}" - ); - } - - public void testWhileWithBlock() throws Exception { - Assert.assertEquals( - statementToKotlin("while (a > b) {int i = 1; i = i + 1;}"), - "while ((a > b))\n" + - "{\n" + - "var i : Int = 1\n" + - "i = (i + 1)\n" + - "}" - ); - } - - public void testWhileWithReturn() throws Exception { - Assert.assertEquals( - statementToKotlin("while (true) return 1;"), - "while (true)\nreturn 1" - ); - } - - public void testWhileWithExpression() throws Exception { - Assert.assertEquals( - statementToKotlin("while (true) i = i + 1;"), - "while (true)\ni = (i + 1)" - ); - } -} diff --git a/testData/arrayAccessExpression/expression/expressionIndex.jav b/testData/arrayAccessExpression/expression/expressionIndex.jav new file mode 100644 index 00000000000..7a99230c2f6 --- /dev/null +++ b/testData/arrayAccessExpression/expression/expressionIndex.jav @@ -0,0 +1 @@ +myArray[myLibrary.calculateIndex(100)] \ No newline at end of file diff --git a/testData/arrayAccessExpression/expression/expressionIndex.kt b/testData/arrayAccessExpression/expression/expressionIndex.kt new file mode 100644 index 00000000000..7a99230c2f6 --- /dev/null +++ b/testData/arrayAccessExpression/expression/expressionIndex.kt @@ -0,0 +1 @@ +myArray[myLibrary.calculateIndex(100)] \ No newline at end of file diff --git a/testData/arrayAccessExpression/expression/intIndex.jav b/testData/arrayAccessExpression/expression/intIndex.jav new file mode 100644 index 00000000000..8a7de5e4e73 --- /dev/null +++ b/testData/arrayAccessExpression/expression/intIndex.jav @@ -0,0 +1 @@ +myArray[10] \ No newline at end of file diff --git a/testData/arrayAccessExpression/expression/intIndex.kt b/testData/arrayAccessExpression/expression/intIndex.kt new file mode 100644 index 00000000000..8a7de5e4e73 --- /dev/null +++ b/testData/arrayAccessExpression/expression/intIndex.kt @@ -0,0 +1 @@ +myArray[10] \ No newline at end of file diff --git a/testData/arrayAccessExpression/expression/variableIndex.jav b/testData/arrayAccessExpression/expression/variableIndex.jav new file mode 100644 index 00000000000..2a40dae7f3b --- /dev/null +++ b/testData/arrayAccessExpression/expression/variableIndex.jav @@ -0,0 +1 @@ +myArray[i] \ No newline at end of file diff --git a/testData/arrayAccessExpression/expression/variableIndex.kt b/testData/arrayAccessExpression/expression/variableIndex.kt new file mode 100644 index 00000000000..2a40dae7f3b --- /dev/null +++ b/testData/arrayAccessExpression/expression/variableIndex.kt @@ -0,0 +1 @@ +myArray[i] \ No newline at end of file diff --git a/testData/arrayInitializerExpression/expression/newInt.jav b/testData/arrayInitializerExpression/expression/newInt.jav new file mode 100644 index 00000000000..0d3fb727286 --- /dev/null +++ b/testData/arrayInitializerExpression/expression/newInt.jav @@ -0,0 +1 @@ +new int[] {1, 2, 3}; \ No newline at end of file diff --git a/testData/arrayInitializerExpression/expression/newInt.kt b/testData/arrayInitializerExpression/expression/newInt.kt new file mode 100644 index 00000000000..5bf3fb77d23 --- /dev/null +++ b/testData/arrayInitializerExpression/expression/newInt.kt @@ -0,0 +1 @@ +array(1, 2, 3) \ No newline at end of file diff --git a/testData/arrayInitializerExpression/expression/oneDim.jav b/testData/arrayInitializerExpression/expression/oneDim.jav new file mode 100644 index 00000000000..bfea03892f9 --- /dev/null +++ b/testData/arrayInitializerExpression/expression/oneDim.jav @@ -0,0 +1 @@ +{1, 2, 3}; \ No newline at end of file diff --git a/testData/arrayInitializerExpression/expression/oneDim.kt b/testData/arrayInitializerExpression/expression/oneDim.kt new file mode 100644 index 00000000000..5bf3fb77d23 --- /dev/null +++ b/testData/arrayInitializerExpression/expression/oneDim.kt @@ -0,0 +1 @@ +array(1, 2, 3) \ No newline at end of file diff --git a/testData/arrayInitializerExpression/expression/oneDimWithVariables.jav b/testData/arrayInitializerExpression/expression/oneDimWithVariables.jav new file mode 100644 index 00000000000..6d0d48ea35d --- /dev/null +++ b/testData/arrayInitializerExpression/expression/oneDimWithVariables.jav @@ -0,0 +1 @@ +{a, b, c}; \ No newline at end of file diff --git a/testData/arrayInitializerExpression/expression/oneDimWithVariables.kt b/testData/arrayInitializerExpression/expression/oneDimWithVariables.kt new file mode 100644 index 00000000000..61951103058 --- /dev/null +++ b/testData/arrayInitializerExpression/expression/oneDimWithVariables.kt @@ -0,0 +1 @@ +array(a, b, c) \ No newline at end of file diff --git a/testData/arrayInitializerExpression/expression/twoDim.jav b/testData/arrayInitializerExpression/expression/twoDim.jav new file mode 100644 index 00000000000..7892cebda83 --- /dev/null +++ b/testData/arrayInitializerExpression/expression/twoDim.jav @@ -0,0 +1 @@ +{ {1, 2, 3}, {4, 5, 6}, {7, 8, 9} }; \ No newline at end of file diff --git a/testData/arrayInitializerExpression/expression/twoDim.kt b/testData/arrayInitializerExpression/expression/twoDim.kt new file mode 100644 index 00000000000..9474db259a3 --- /dev/null +++ b/testData/arrayInitializerExpression/expression/twoDim.kt @@ -0,0 +1 @@ +array(array(1, 2, 3), array(4, 5, 6), array(7, 8, 9)) \ No newline at end of file diff --git a/testData/arrayType/method/methodArrayArgs.jav b/testData/arrayType/method/methodArrayArgs.jav new file mode 100644 index 00000000000..c5c5768faf4 --- /dev/null +++ b/testData/arrayType/method/methodArrayArgs.jav @@ -0,0 +1 @@ +void fromArrayToCollection(Foo[] a) {} \ No newline at end of file diff --git a/testData/arrayType/method/methodArrayArgs.kt b/testData/arrayType/method/methodArrayArgs.kt new file mode 100644 index 00000000000..6bd0c42dd8b --- /dev/null +++ b/testData/arrayType/method/methodArrayArgs.kt @@ -0,0 +1 @@ +fun fromArrayToCollection(a : Array?) : Unit { } \ No newline at end of file diff --git a/testData/arrayType/statement/arrayInitializationStatement.jav b/testData/arrayType/statement/arrayInitializationStatement.jav new file mode 100644 index 00000000000..781bcb6a731 --- /dev/null +++ b/testData/arrayType/statement/arrayInitializationStatement.jav @@ -0,0 +1 @@ +int [][] d2 = new int[][]{}; \ No newline at end of file diff --git a/testData/arrayType/statement/arrayInitializationStatement.kt b/testData/arrayType/statement/arrayInitializationStatement.kt new file mode 100644 index 00000000000..283e73ae8ae --- /dev/null +++ b/testData/arrayType/statement/arrayInitializationStatement.kt @@ -0,0 +1 @@ +var d2 : Array? = array() \ No newline at end of file diff --git a/testData/arrayType/statement/arrayInitializationStatementWithDimension.jav b/testData/arrayType/statement/arrayInitializationStatementWithDimension.jav new file mode 100644 index 00000000000..01c957d5dfe --- /dev/null +++ b/testData/arrayType/statement/arrayInitializationStatementWithDimension.jav @@ -0,0 +1 @@ +int [][] d2 = new int[5][]; \ No newline at end of file diff --git a/testData/arrayType/statement/arrayInitializationStatementWithDimension.kt b/testData/arrayType/statement/arrayInitializationStatementWithDimension.kt new file mode 100644 index 00000000000..3add329fe03 --- /dev/null +++ b/testData/arrayType/statement/arrayInitializationStatementWithDimension.kt @@ -0,0 +1 @@ +var d2 : Array? = Array?(5, {null}) \ No newline at end of file diff --git a/testData/arrayType/statement_mult/doubleArray.jav b/testData/arrayType/statement_mult/doubleArray.jav new file mode 100644 index 00000000000..ff57a8cb89d --- /dev/null +++ b/testData/arrayType/statement_mult/doubleArray.jav @@ -0,0 +1 @@ +double[] a = new double[]{1, 2, 3} \ No newline at end of file diff --git a/testData/arrayType/statement_mult/doubleArray.kt b/testData/arrayType/statement_mult/doubleArray.kt new file mode 100644 index 00000000000..152845e23f9 --- /dev/null +++ b/testData/arrayType/statement_mult/doubleArray.kt @@ -0,0 +1 @@ +var a : DoubleArray? = array(1, 2, 3) \ No newline at end of file diff --git a/testData/arrayType/statement_mult/longArray.jav b/testData/arrayType/statement_mult/longArray.jav new file mode 100644 index 00000000000..8ba3eb35a5c --- /dev/null +++ b/testData/arrayType/statement_mult/longArray.jav @@ -0,0 +1 @@ +long[] a = new long[]{1, 2, 3} \ No newline at end of file diff --git a/testData/arrayType/statement_mult/longArray.kt b/testData/arrayType/statement_mult/longArray.kt new file mode 100644 index 00000000000..f4a9760f755 --- /dev/null +++ b/testData/arrayType/statement_mult/longArray.kt @@ -0,0 +1 @@ +var a : LongArray? = array(1, 2, 3) \ No newline at end of file diff --git a/testData/arrayType/statement_mult/newIntArray.jav b/testData/arrayType/statement_mult/newIntArray.jav new file mode 100644 index 00000000000..8c66b71c91f --- /dev/null +++ b/testData/arrayType/statement_mult/newIntArray.jav @@ -0,0 +1 @@ +int[] a = new int[]{1, 2, 3} \ No newline at end of file diff --git a/testData/arrayType/statement_mult/newIntArray.kt b/testData/arrayType/statement_mult/newIntArray.kt new file mode 100644 index 00000000000..7b306f0e0fc --- /dev/null +++ b/testData/arrayType/statement_mult/newIntArray.kt @@ -0,0 +1 @@ +var a : IntArray? = array(1, 2, 3) \ No newline at end of file diff --git a/testData/arrayType/statement_mult/newStringArray.jav b/testData/arrayType/statement_mult/newStringArray.jav new file mode 100644 index 00000000000..371c13bfa2d --- /dev/null +++ b/testData/arrayType/statement_mult/newStringArray.jav @@ -0,0 +1 @@ +String[] a = new String[]{"abc"} \ No newline at end of file diff --git a/testData/arrayType/statement_mult/newStringArray.kt b/testData/arrayType/statement_mult/newStringArray.kt new file mode 100644 index 00000000000..75bd5eaa610 --- /dev/null +++ b/testData/arrayType/statement_mult/newStringArray.kt @@ -0,0 +1 @@ +var a : Array? = array("abc") \ No newline at end of file diff --git a/testData/assertStatement/statement_mult/onlyCondition.jav b/testData/assertStatement/statement_mult/onlyCondition.jav new file mode 100644 index 00000000000..7ac44744fe6 --- /dev/null +++ b/testData/assertStatement/statement_mult/onlyCondition.jav @@ -0,0 +1 @@ +assert boolMethod(); \ No newline at end of file diff --git a/testData/assertStatement/statement_mult/onlyCondition.kt b/testData/assertStatement/statement_mult/onlyCondition.kt new file mode 100644 index 00000000000..e148b562e0c --- /dev/null +++ b/testData/assertStatement/statement_mult/onlyCondition.kt @@ -0,0 +1 @@ +assert {boolMethod()} \ No newline at end of file diff --git a/testData/assertStatement/statement_mult/onlyConditionWithBraces.jav b/testData/assertStatement/statement_mult/onlyConditionWithBraces.jav new file mode 100644 index 00000000000..b1c738d82a9 --- /dev/null +++ b/testData/assertStatement/statement_mult/onlyConditionWithBraces.jav @@ -0,0 +1 @@ +assert(boolMethod()); \ No newline at end of file diff --git a/testData/assertStatement/statement_mult/onlyConditionWithBraces.kt b/testData/assertStatement/statement_mult/onlyConditionWithBraces.kt new file mode 100644 index 00000000000..dda5f1e1170 --- /dev/null +++ b/testData/assertStatement/statement_mult/onlyConditionWithBraces.kt @@ -0,0 +1 @@ +assert {(boolMethod())} \ No newline at end of file diff --git a/testData/assertStatement/statement_mult/withStringDetail.jav b/testData/assertStatement/statement_mult/withStringDetail.jav new file mode 100644 index 00000000000..aad7600e036 --- /dev/null +++ b/testData/assertStatement/statement_mult/withStringDetail.jav @@ -0,0 +1 @@ +assert true : "string details"; \ No newline at end of file diff --git a/testData/assertStatement/statement_mult/withStringDetail.kt b/testData/assertStatement/statement_mult/withStringDetail.kt new file mode 100644 index 00000000000..9fa45aa19e7 --- /dev/null +++ b/testData/assertStatement/statement_mult/withStringDetail.kt @@ -0,0 +1 @@ +assert("string details") {true} \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/and.jav b/testData/assignmentExpression/expression_mult/and.jav new file mode 100644 index 00000000000..d345703fc8e --- /dev/null +++ b/testData/assignmentExpression/expression_mult/and.jav @@ -0,0 +1 @@ +x &= 2 \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/and.kt b/testData/assignmentExpression/expression_mult/and.kt new file mode 100644 index 00000000000..9d3b5a87264 --- /dev/null +++ b/testData/assignmentExpression/expression_mult/and.kt @@ -0,0 +1 @@ +x = (x and 2) \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/assignment.jav b/testData/assignmentExpression/expression_mult/assignment.jav new file mode 100644 index 00000000000..1ddfb7dc8e4 --- /dev/null +++ b/testData/assignmentExpression/expression_mult/assignment.jav @@ -0,0 +1 @@ +x = 2 \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/assignment.kt b/testData/assignmentExpression/expression_mult/assignment.kt new file mode 100644 index 00000000000..1ddfb7dc8e4 --- /dev/null +++ b/testData/assignmentExpression/expression_mult/assignment.kt @@ -0,0 +1 @@ +x = 2 \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/divideAssign.jav b/testData/assignmentExpression/expression_mult/divideAssign.jav new file mode 100644 index 00000000000..e63372a6277 --- /dev/null +++ b/testData/assignmentExpression/expression_mult/divideAssign.jav @@ -0,0 +1 @@ +x /= 2 \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/divideAssign.kt b/testData/assignmentExpression/expression_mult/divideAssign.kt new file mode 100644 index 00000000000..e63372a6277 --- /dev/null +++ b/testData/assignmentExpression/expression_mult/divideAssign.kt @@ -0,0 +1 @@ +x /= 2 \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/minusAssign.jav b/testData/assignmentExpression/expression_mult/minusAssign.jav new file mode 100644 index 00000000000..58f87ee4a6c --- /dev/null +++ b/testData/assignmentExpression/expression_mult/minusAssign.jav @@ -0,0 +1 @@ +x -= 2 \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/minusAssign.kt b/testData/assignmentExpression/expression_mult/minusAssign.kt new file mode 100644 index 00000000000..58f87ee4a6c --- /dev/null +++ b/testData/assignmentExpression/expression_mult/minusAssign.kt @@ -0,0 +1 @@ +x -= 2 \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/multiplyAssign.jav b/testData/assignmentExpression/expression_mult/multiplyAssign.jav new file mode 100644 index 00000000000..ddea70541b0 --- /dev/null +++ b/testData/assignmentExpression/expression_mult/multiplyAssign.jav @@ -0,0 +1 @@ +x *= 2 \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/multiplyAssign.kt b/testData/assignmentExpression/expression_mult/multiplyAssign.kt new file mode 100644 index 00000000000..ddea70541b0 --- /dev/null +++ b/testData/assignmentExpression/expression_mult/multiplyAssign.kt @@ -0,0 +1 @@ +x *= 2 \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/or.jav b/testData/assignmentExpression/expression_mult/or.jav new file mode 100644 index 00000000000..07b425b9cc5 --- /dev/null +++ b/testData/assignmentExpression/expression_mult/or.jav @@ -0,0 +1 @@ +x |= 2 \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/or.kt b/testData/assignmentExpression/expression_mult/or.kt new file mode 100644 index 00000000000..9ec6c02a731 --- /dev/null +++ b/testData/assignmentExpression/expression_mult/or.kt @@ -0,0 +1 @@ +x = (x or 2) \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/plusAssign.jav b/testData/assignmentExpression/expression_mult/plusAssign.jav new file mode 100644 index 00000000000..2448227cb69 --- /dev/null +++ b/testData/assignmentExpression/expression_mult/plusAssign.jav @@ -0,0 +1 @@ +x += 2 \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/plusAssign.kt b/testData/assignmentExpression/expression_mult/plusAssign.kt new file mode 100644 index 00000000000..2448227cb69 --- /dev/null +++ b/testData/assignmentExpression/expression_mult/plusAssign.kt @@ -0,0 +1 @@ +x += 2 \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/reminder.jav b/testData/assignmentExpression/expression_mult/reminder.jav new file mode 100644 index 00000000000..b6fe73d0db1 --- /dev/null +++ b/testData/assignmentExpression/expression_mult/reminder.jav @@ -0,0 +1 @@ +x %= 2 \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/reminder.kt b/testData/assignmentExpression/expression_mult/reminder.kt new file mode 100644 index 00000000000..b6fe73d0db1 --- /dev/null +++ b/testData/assignmentExpression/expression_mult/reminder.kt @@ -0,0 +1 @@ +x %= 2 \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/shiftLeft.jav b/testData/assignmentExpression/expression_mult/shiftLeft.jav new file mode 100644 index 00000000000..1b5eb34ba7e --- /dev/null +++ b/testData/assignmentExpression/expression_mult/shiftLeft.jav @@ -0,0 +1 @@ +x <<= 2 \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/shiftLeft.kt b/testData/assignmentExpression/expression_mult/shiftLeft.kt new file mode 100644 index 00000000000..9952d811313 --- /dev/null +++ b/testData/assignmentExpression/expression_mult/shiftLeft.kt @@ -0,0 +1 @@ +x = (x shl 2) \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/shiftRight.jav b/testData/assignmentExpression/expression_mult/shiftRight.jav new file mode 100644 index 00000000000..ac7c546b4cb --- /dev/null +++ b/testData/assignmentExpression/expression_mult/shiftRight.jav @@ -0,0 +1 @@ +x >>= 2 \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/shiftRight.kt b/testData/assignmentExpression/expression_mult/shiftRight.kt new file mode 100644 index 00000000000..05fb0966ed7 --- /dev/null +++ b/testData/assignmentExpression/expression_mult/shiftRight.kt @@ -0,0 +1 @@ +x = (x shr 2) \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/unsignedRightShift.jav b/testData/assignmentExpression/expression_mult/unsignedRightShift.jav new file mode 100644 index 00000000000..80750c37495 --- /dev/null +++ b/testData/assignmentExpression/expression_mult/unsignedRightShift.jav @@ -0,0 +1 @@ +x >>>= 2 \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/unsignedRightShift.kt b/testData/assignmentExpression/expression_mult/unsignedRightShift.kt new file mode 100644 index 00000000000..ce853a663b7 --- /dev/null +++ b/testData/assignmentExpression/expression_mult/unsignedRightShift.kt @@ -0,0 +1 @@ +x = x.cyclicShiftRight(2) \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/xor.jav b/testData/assignmentExpression/expression_mult/xor.jav new file mode 100644 index 00000000000..2f6e418eb5d --- /dev/null +++ b/testData/assignmentExpression/expression_mult/xor.jav @@ -0,0 +1 @@ +x ^= 2 \ No newline at end of file diff --git a/testData/assignmentExpression/expression_mult/xor.kt b/testData/assignmentExpression/expression_mult/xor.kt new file mode 100644 index 00000000000..e6cd6c7b628 --- /dev/null +++ b/testData/assignmentExpression/expression_mult/xor.kt @@ -0,0 +1 @@ +x = (x xor 2) \ No newline at end of file diff --git a/testData/assignmentExpression/statement/simpleAssignment.jav b/testData/assignmentExpression/statement/simpleAssignment.jav new file mode 100644 index 00000000000..5cb450aa538 --- /dev/null +++ b/testData/assignmentExpression/statement/simpleAssignment.jav @@ -0,0 +1 @@ +i = 1; \ No newline at end of file diff --git a/testData/assignmentExpression/statement/simpleAssignment.kt b/testData/assignmentExpression/statement/simpleAssignment.kt new file mode 100644 index 00000000000..88de072edc6 --- /dev/null +++ b/testData/assignmentExpression/statement/simpleAssignment.kt @@ -0,0 +1 @@ +i = 1 \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/and.jav b/testData/binaryExpression/expression_mult/and.jav new file mode 100644 index 00000000000..8c519f1a5d3 --- /dev/null +++ b/testData/binaryExpression/expression_mult/and.jav @@ -0,0 +1 @@ +x & 2 \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/and.kt b/testData/binaryExpression/expression_mult/and.kt new file mode 100644 index 00000000000..cf06df2166f --- /dev/null +++ b/testData/binaryExpression/expression_mult/and.kt @@ -0,0 +1 @@ +(x and 2) \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/conditionalAnd.jav b/testData/binaryExpression/expression_mult/conditionalAnd.jav new file mode 100644 index 00000000000..5aa60340840 --- /dev/null +++ b/testData/binaryExpression/expression_mult/conditionalAnd.jav @@ -0,0 +1 @@ +true && false \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/conditionalAnd.kt b/testData/binaryExpression/expression_mult/conditionalAnd.kt new file mode 100644 index 00000000000..c15d239fc59 --- /dev/null +++ b/testData/binaryExpression/expression_mult/conditionalAnd.kt @@ -0,0 +1 @@ +(true && false) \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/conditionalOr.jav b/testData/binaryExpression/expression_mult/conditionalOr.jav new file mode 100644 index 00000000000..64634c472bc --- /dev/null +++ b/testData/binaryExpression/expression_mult/conditionalOr.jav @@ -0,0 +1 @@ +true || false \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/conditionalOr.kt b/testData/binaryExpression/expression_mult/conditionalOr.kt new file mode 100644 index 00000000000..468a7054c7e --- /dev/null +++ b/testData/binaryExpression/expression_mult/conditionalOr.kt @@ -0,0 +1 @@ +(true || false) \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/divide.jav b/testData/binaryExpression/expression_mult/divide.jav new file mode 100644 index 00000000000..0e0b5d58618 --- /dev/null +++ b/testData/binaryExpression/expression_mult/divide.jav @@ -0,0 +1 @@ +1 / 2 \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/divide.kt b/testData/binaryExpression/expression_mult/divide.kt new file mode 100644 index 00000000000..65ee04050be --- /dev/null +++ b/testData/binaryExpression/expression_mult/divide.kt @@ -0,0 +1 @@ +(1 / 2) \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/greaterThan.jav b/testData/binaryExpression/expression_mult/greaterThan.jav new file mode 100644 index 00000000000..2774817e788 --- /dev/null +++ b/testData/binaryExpression/expression_mult/greaterThan.jav @@ -0,0 +1 @@ +1 > 2 \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/greaterThan.kt b/testData/binaryExpression/expression_mult/greaterThan.kt new file mode 100644 index 00000000000..daff50ff64b --- /dev/null +++ b/testData/binaryExpression/expression_mult/greaterThan.kt @@ -0,0 +1 @@ +(1 > 2) \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/greaterThanEqual.jav b/testData/binaryExpression/expression_mult/greaterThanEqual.jav new file mode 100644 index 00000000000..6993045c7a2 --- /dev/null +++ b/testData/binaryExpression/expression_mult/greaterThanEqual.jav @@ -0,0 +1 @@ +1 >= 2 \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/greaterThanEqual.kt b/testData/binaryExpression/expression_mult/greaterThanEqual.kt new file mode 100644 index 00000000000..3df78eab7e7 --- /dev/null +++ b/testData/binaryExpression/expression_mult/greaterThanEqual.kt @@ -0,0 +1 @@ +(1 >= 2) \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/lessThan.jav b/testData/binaryExpression/expression_mult/lessThan.jav new file mode 100644 index 00000000000..535e996ad9b --- /dev/null +++ b/testData/binaryExpression/expression_mult/lessThan.jav @@ -0,0 +1 @@ +1 < 2 \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/lessThan.kt b/testData/binaryExpression/expression_mult/lessThan.kt new file mode 100644 index 00000000000..c82ddfbad9f --- /dev/null +++ b/testData/binaryExpression/expression_mult/lessThan.kt @@ -0,0 +1 @@ +(1 < 2) \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/lessThanEqual.jav b/testData/binaryExpression/expression_mult/lessThanEqual.jav new file mode 100644 index 00000000000..5e9475f92bf --- /dev/null +++ b/testData/binaryExpression/expression_mult/lessThanEqual.jav @@ -0,0 +1 @@ +1 <= 2 \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/lessThanEqual.kt b/testData/binaryExpression/expression_mult/lessThanEqual.kt new file mode 100644 index 00000000000..46d80ee7ff7 --- /dev/null +++ b/testData/binaryExpression/expression_mult/lessThanEqual.kt @@ -0,0 +1 @@ +(1 <= 2) \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/minus.jav b/testData/binaryExpression/expression_mult/minus.jav new file mode 100644 index 00000000000..7ec0a893aef --- /dev/null +++ b/testData/binaryExpression/expression_mult/minus.jav @@ -0,0 +1 @@ +1 - 2 \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/minus.kt b/testData/binaryExpression/expression_mult/minus.kt new file mode 100644 index 00000000000..cf09bd8aa78 --- /dev/null +++ b/testData/binaryExpression/expression_mult/minus.kt @@ -0,0 +1 @@ +(1 - 2) \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/multiply.jav b/testData/binaryExpression/expression_mult/multiply.jav new file mode 100644 index 00000000000..a48dfec9fa5 --- /dev/null +++ b/testData/binaryExpression/expression_mult/multiply.jav @@ -0,0 +1 @@ +1 * 2 \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/multiply.kt b/testData/binaryExpression/expression_mult/multiply.kt new file mode 100644 index 00000000000..aa007e342a1 --- /dev/null +++ b/testData/binaryExpression/expression_mult/multiply.kt @@ -0,0 +1 @@ +(1 * 2) \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/or.jav b/testData/binaryExpression/expression_mult/or.jav new file mode 100644 index 00000000000..27e32efa3d5 --- /dev/null +++ b/testData/binaryExpression/expression_mult/or.jav @@ -0,0 +1 @@ +x | 2 \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/or.kt b/testData/binaryExpression/expression_mult/or.kt new file mode 100644 index 00000000000..70cd0ea4f20 --- /dev/null +++ b/testData/binaryExpression/expression_mult/or.kt @@ -0,0 +1 @@ +(x or 2) \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/plus.jav b/testData/binaryExpression/expression_mult/plus.jav new file mode 100644 index 00000000000..193df0b550b --- /dev/null +++ b/testData/binaryExpression/expression_mult/plus.jav @@ -0,0 +1 @@ +1 + 2 \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/plus.kt b/testData/binaryExpression/expression_mult/plus.kt new file mode 100644 index 00000000000..0a911375668 --- /dev/null +++ b/testData/binaryExpression/expression_mult/plus.kt @@ -0,0 +1 @@ +(1 + 2) \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/remainder.jav b/testData/binaryExpression/expression_mult/remainder.jav new file mode 100644 index 00000000000..049211394d2 --- /dev/null +++ b/testData/binaryExpression/expression_mult/remainder.jav @@ -0,0 +1 @@ +1 % 2 \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/remainder.kt b/testData/binaryExpression/expression_mult/remainder.kt new file mode 100644 index 00000000000..619e890f226 --- /dev/null +++ b/testData/binaryExpression/expression_mult/remainder.kt @@ -0,0 +1 @@ +(1 % 2) \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/shiftLeft.jav b/testData/binaryExpression/expression_mult/shiftLeft.jav new file mode 100644 index 00000000000..0fc7ee16109 --- /dev/null +++ b/testData/binaryExpression/expression_mult/shiftLeft.jav @@ -0,0 +1 @@ +x << 2 \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/shiftLeft.kt b/testData/binaryExpression/expression_mult/shiftLeft.kt new file mode 100644 index 00000000000..f9ea88f60e9 --- /dev/null +++ b/testData/binaryExpression/expression_mult/shiftLeft.kt @@ -0,0 +1 @@ +(x shl 2) \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/shiftRight.jav b/testData/binaryExpression/expression_mult/shiftRight.jav new file mode 100644 index 00000000000..452d459f0be --- /dev/null +++ b/testData/binaryExpression/expression_mult/shiftRight.jav @@ -0,0 +1 @@ +x >> 2 \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/shiftRight.kt b/testData/binaryExpression/expression_mult/shiftRight.kt new file mode 100644 index 00000000000..43f26e93b84 --- /dev/null +++ b/testData/binaryExpression/expression_mult/shiftRight.kt @@ -0,0 +1 @@ +(x shr 2) \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/unsignedRightShift.jav b/testData/binaryExpression/expression_mult/unsignedRightShift.jav new file mode 100644 index 00000000000..43c9914d750 --- /dev/null +++ b/testData/binaryExpression/expression_mult/unsignedRightShift.jav @@ -0,0 +1 @@ +x >>> 2 \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/unsignedRightShift.kt b/testData/binaryExpression/expression_mult/unsignedRightShift.kt new file mode 100644 index 00000000000..cda6648c88e --- /dev/null +++ b/testData/binaryExpression/expression_mult/unsignedRightShift.kt @@ -0,0 +1 @@ +x.cyclicShiftRight(2) \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/xor.jav b/testData/binaryExpression/expression_mult/xor.jav new file mode 100644 index 00000000000..09b544bdf1e --- /dev/null +++ b/testData/binaryExpression/expression_mult/xor.jav @@ -0,0 +1 @@ +x ^ 2 \ No newline at end of file diff --git a/testData/binaryExpression/expression_mult/xor.kt b/testData/binaryExpression/expression_mult/xor.kt new file mode 100644 index 00000000000..918f54e7c68 --- /dev/null +++ b/testData/binaryExpression/expression_mult/xor.kt @@ -0,0 +1 @@ +(x xor 2) \ No newline at end of file diff --git a/testData/boxedType/statement_mult/boolean.jav b/testData/boxedType/statement_mult/boolean.jav new file mode 100644 index 00000000000..ccd666e6ee8 --- /dev/null +++ b/testData/boxedType/statement_mult/boolean.jav @@ -0,0 +1 @@ +Boolean i = 10; \ No newline at end of file diff --git a/testData/boxedType/statement_mult/boolean.kt b/testData/boxedType/statement_mult/boolean.kt new file mode 100644 index 00000000000..a04aa401cb4 --- /dev/null +++ b/testData/boxedType/statement_mult/boolean.kt @@ -0,0 +1 @@ +var i : Boolean? = 10 \ No newline at end of file diff --git a/testData/boxedType/statement_mult/byte.jav b/testData/boxedType/statement_mult/byte.jav new file mode 100644 index 00000000000..14a750b548b --- /dev/null +++ b/testData/boxedType/statement_mult/byte.jav @@ -0,0 +1 @@ +Byte i = 10; \ No newline at end of file diff --git a/testData/boxedType/statement_mult/byte.kt b/testData/boxedType/statement_mult/byte.kt new file mode 100644 index 00000000000..c44367fae64 --- /dev/null +++ b/testData/boxedType/statement_mult/byte.kt @@ -0,0 +1 @@ +var i : Byte? = 10 \ No newline at end of file diff --git a/testData/boxedType/statement_mult/character.jav b/testData/boxedType/statement_mult/character.jav new file mode 100644 index 00000000000..611a419cc54 --- /dev/null +++ b/testData/boxedType/statement_mult/character.jav @@ -0,0 +1 @@ +Character i = 10; \ No newline at end of file diff --git a/testData/boxedType/statement_mult/character.kt b/testData/boxedType/statement_mult/character.kt new file mode 100644 index 00000000000..66c64a43830 --- /dev/null +++ b/testData/boxedType/statement_mult/character.kt @@ -0,0 +1 @@ +var i : Char? = 10 \ No newline at end of file diff --git a/testData/boxedType/statement_mult/double.jav b/testData/boxedType/statement_mult/double.jav new file mode 100644 index 00000000000..691af6d77f6 --- /dev/null +++ b/testData/boxedType/statement_mult/double.jav @@ -0,0 +1 @@ +Double i = 10; \ No newline at end of file diff --git a/testData/boxedType/statement_mult/double.kt b/testData/boxedType/statement_mult/double.kt new file mode 100644 index 00000000000..ad23a49855d --- /dev/null +++ b/testData/boxedType/statement_mult/double.kt @@ -0,0 +1 @@ +var i : Double? = 10 \ No newline at end of file diff --git a/testData/boxedType/statement_mult/float.jav b/testData/boxedType/statement_mult/float.jav new file mode 100644 index 00000000000..c283bbbe5fa --- /dev/null +++ b/testData/boxedType/statement_mult/float.jav @@ -0,0 +1 @@ +Float i = 10; \ No newline at end of file diff --git a/testData/boxedType/statement_mult/float.kt b/testData/boxedType/statement_mult/float.kt new file mode 100644 index 00000000000..72df9c19575 --- /dev/null +++ b/testData/boxedType/statement_mult/float.kt @@ -0,0 +1 @@ +var i : Float? = 10 \ No newline at end of file diff --git a/testData/boxedType/statement_mult/integer.jav b/testData/boxedType/statement_mult/integer.jav new file mode 100644 index 00000000000..ce81c24fe40 --- /dev/null +++ b/testData/boxedType/statement_mult/integer.jav @@ -0,0 +1 @@ +Integer i = 10; \ No newline at end of file diff --git a/testData/boxedType/statement_mult/integer.kt b/testData/boxedType/statement_mult/integer.kt new file mode 100644 index 00000000000..eb490098482 --- /dev/null +++ b/testData/boxedType/statement_mult/integer.kt @@ -0,0 +1 @@ +var i : Int? = 10 \ No newline at end of file diff --git a/testData/boxedType/statement_mult/long.jav b/testData/boxedType/statement_mult/long.jav new file mode 100644 index 00000000000..9ca58295d8a --- /dev/null +++ b/testData/boxedType/statement_mult/long.jav @@ -0,0 +1 @@ +Long i = 10; \ No newline at end of file diff --git a/testData/boxedType/statement_mult/long.kt b/testData/boxedType/statement_mult/long.kt new file mode 100644 index 00000000000..aa1584ac634 --- /dev/null +++ b/testData/boxedType/statement_mult/long.kt @@ -0,0 +1 @@ +var i : Long? = 10 \ No newline at end of file diff --git a/testData/boxedType/statement_mult/object.jav b/testData/boxedType/statement_mult/object.jav new file mode 100644 index 00000000000..ca135870cd6 --- /dev/null +++ b/testData/boxedType/statement_mult/object.jav @@ -0,0 +1 @@ +Object i = 10; \ No newline at end of file diff --git a/testData/boxedType/statement_mult/object.kt b/testData/boxedType/statement_mult/object.kt new file mode 100644 index 00000000000..611c618a389 --- /dev/null +++ b/testData/boxedType/statement_mult/object.kt @@ -0,0 +1 @@ +var i : Any? = 10 \ No newline at end of file diff --git a/testData/boxedType/statement_mult/short.jav b/testData/boxedType/statement_mult/short.jav new file mode 100644 index 00000000000..1364e5c8dbb --- /dev/null +++ b/testData/boxedType/statement_mult/short.jav @@ -0,0 +1 @@ +Short i = 10; \ No newline at end of file diff --git a/testData/boxedType/statement_mult/short.kt b/testData/boxedType/statement_mult/short.kt new file mode 100644 index 00000000000..8daff77deb3 --- /dev/null +++ b/testData/boxedType/statement_mult/short.kt @@ -0,0 +1 @@ +var i : Short? = 10 \ No newline at end of file diff --git a/testData/breakStatement/statement/breakWithLabel.jav b/testData/breakStatement/statement/breakWithLabel.jav new file mode 100644 index 00000000000..b2375dc68b4 --- /dev/null +++ b/testData/breakStatement/statement/breakWithLabel.jav @@ -0,0 +1 @@ +break label; \ No newline at end of file diff --git a/testData/breakStatement/statement/breakWithLabel.kt b/testData/breakStatement/statement/breakWithLabel.kt new file mode 100644 index 00000000000..02d8620a138 --- /dev/null +++ b/testData/breakStatement/statement/breakWithLabel.kt @@ -0,0 +1 @@ +break@label \ No newline at end of file diff --git a/testData/breakStatement/statement/breakWithoutLabel.jav b/testData/breakStatement/statement/breakWithoutLabel.jav new file mode 100644 index 00000000000..8cb76cf02d7 --- /dev/null +++ b/testData/breakStatement/statement/breakWithoutLabel.jav @@ -0,0 +1 @@ +break; \ No newline at end of file diff --git a/testData/breakStatement/statement/breakWithoutLabel.kt b/testData/breakStatement/statement/breakWithoutLabel.kt new file mode 100644 index 00000000000..5da70343a46 --- /dev/null +++ b/testData/breakStatement/statement/breakWithoutLabel.kt @@ -0,0 +1 @@ +break \ No newline at end of file diff --git a/testData/class_/class/class.jav b/testData/class_/class/class.jav new file mode 100644 index 00000000000..183c3f5b3be --- /dev/null +++ b/testData/class_/class/class.jav @@ -0,0 +1 @@ +class Test {} \ No newline at end of file diff --git a/testData/class_/class/class.kt b/testData/class_/class/class.kt new file mode 100644 index 00000000000..503cbe46e7f --- /dev/null +++ b/testData/class_/class/class.kt @@ -0,0 +1 @@ +open class Test { } \ No newline at end of file diff --git a/testData/class_/class/emptyClass.jav b/testData/class_/class/emptyClass.jav new file mode 100644 index 00000000000..151119ab6a7 --- /dev/null +++ b/testData/class_/class/emptyClass.jav @@ -0,0 +1 @@ +final class A {} \ No newline at end of file diff --git a/testData/class_/class/emptyClass.kt b/testData/class_/class/emptyClass.kt new file mode 100644 index 00000000000..0e9ef9e73c2 --- /dev/null +++ b/testData/class_/class/emptyClass.kt @@ -0,0 +1 @@ +class A { } \ No newline at end of file diff --git a/testData/class_/class/extendsOneClassAndImplementsOneInterface.jav b/testData/class_/class/extendsOneClassAndImplementsOneInterface.jav new file mode 100644 index 00000000000..b306e379a44 --- /dev/null +++ b/testData/class_/class/extendsOneClassAndImplementsOneInterface.jav @@ -0,0 +1 @@ +final class A extends Base implements I {} \ No newline at end of file diff --git a/testData/class_/class/extendsOneClassAndImplementsOneInterface.kt b/testData/class_/class/extendsOneClassAndImplementsOneInterface.kt new file mode 100644 index 00000000000..4bb2a7ab769 --- /dev/null +++ b/testData/class_/class/extendsOneClassAndImplementsOneInterface.kt @@ -0,0 +1 @@ +class A : Base, I { } \ No newline at end of file diff --git a/testData/class_/class/extendsOneClassAndImplementsSeveralInterfaces.jav b/testData/class_/class/extendsOneClassAndImplementsSeveralInterfaces.jav new file mode 100644 index 00000000000..dd454cafdb7 --- /dev/null +++ b/testData/class_/class/extendsOneClassAndImplementsSeveralInterfaces.jav @@ -0,0 +1 @@ +final class A extends Base implements I0, I1, I2 {} \ No newline at end of file diff --git a/testData/class_/class/extendsOneClassAndImplementsSeveralInterfaces.kt b/testData/class_/class/extendsOneClassAndImplementsSeveralInterfaces.kt new file mode 100644 index 00000000000..e86ee0f0518 --- /dev/null +++ b/testData/class_/class/extendsOneClassAndImplementsSeveralInterfaces.kt @@ -0,0 +1 @@ +class A : Base, I0, I1, I2 { } \ No newline at end of file diff --git a/testData/class_/class/finalClass.jav b/testData/class_/class/finalClass.jav new file mode 100644 index 00000000000..5071bba9931 --- /dev/null +++ b/testData/class_/class/finalClass.jav @@ -0,0 +1 @@ +final class Test {} \ No newline at end of file diff --git a/testData/class_/class/finalClass.kt b/testData/class_/class/finalClass.kt new file mode 100644 index 00000000000..5a0c97725b1 --- /dev/null +++ b/testData/class_/class/finalClass.kt @@ -0,0 +1 @@ +class Test { } \ No newline at end of file diff --git a/testData/class_/class/genericClass.jav b/testData/class_/class/genericClass.jav new file mode 100644 index 00000000000..b18123be7cb --- /dev/null +++ b/testData/class_/class/genericClass.jav @@ -0,0 +1 @@ +final class Entry {} \ No newline at end of file diff --git a/testData/class_/class/genericClass.kt b/testData/class_/class/genericClass.kt new file mode 100644 index 00000000000..e7612b27f50 --- /dev/null +++ b/testData/class_/class/genericClass.kt @@ -0,0 +1 @@ +class Entry { } \ No newline at end of file diff --git a/testData/class_/class/innerEmptyClass.jav b/testData/class_/class/innerEmptyClass.jav new file mode 100644 index 00000000000..3053641622a --- /dev/null +++ b/testData/class_/class/innerEmptyClass.jav @@ -0,0 +1 @@ +final class A { inner final class B {} } \ No newline at end of file diff --git a/testData/class_/class/innerEmptyClass.kt b/testData/class_/class/innerEmptyClass.kt new file mode 100644 index 00000000000..630943255b1 --- /dev/null +++ b/testData/class_/class/innerEmptyClass.kt @@ -0,0 +1 @@ +class A { class B { } } \ No newline at end of file diff --git a/testData/class_/class/innerStaticClass.jav b/testData/class_/class/innerStaticClass.jav new file mode 100644 index 00000000000..d0885630764 --- /dev/null +++ b/testData/class_/class/innerStaticClass.jav @@ -0,0 +1 @@ +final class S { static class Inner {} } \ No newline at end of file diff --git a/testData/class_/class/innerStaticClass.kt b/testData/class_/class/innerStaticClass.kt new file mode 100644 index 00000000000..0041dfabfdd --- /dev/null +++ b/testData/class_/class/innerStaticClass.kt @@ -0,0 +1 @@ +class S { class object { open class Inner { } } } \ No newline at end of file diff --git a/testData/class_/class/internalClass.jav b/testData/class_/class/internalClass.jav new file mode 100644 index 00000000000..183c3f5b3be --- /dev/null +++ b/testData/class_/class/internalClass.jav @@ -0,0 +1 @@ +class Test {} \ No newline at end of file diff --git a/testData/class_/class/internalClass.kt b/testData/class_/class/internalClass.kt new file mode 100644 index 00000000000..503cbe46e7f --- /dev/null +++ b/testData/class_/class/internalClass.kt @@ -0,0 +1 @@ +open class Test { } \ No newline at end of file diff --git a/testData/class_/class/oneStaticFieldOneNonStatic.jav b/testData/class_/class/oneStaticFieldOneNonStatic.jav new file mode 100644 index 00000000000..0e0b14688a4 --- /dev/null +++ b/testData/class_/class/oneStaticFieldOneNonStatic.jav @@ -0,0 +1 @@ +final class S { boolean sB() { return true; } static int myI = 10; } \ No newline at end of file diff --git a/testData/class_/class/oneStaticFieldOneNonStatic.kt b/testData/class_/class/oneStaticFieldOneNonStatic.kt new file mode 100644 index 00000000000..37e1a2c5efa --- /dev/null +++ b/testData/class_/class/oneStaticFieldOneNonStatic.kt @@ -0,0 +1 @@ +class S { class object { var myI : Int = 10 } fun sB() : Boolean { return true } } \ No newline at end of file diff --git a/testData/class_/class/oneStaticMethod.jav b/testData/class_/class/oneStaticMethod.jav new file mode 100644 index 00000000000..98884d114b7 --- /dev/null +++ b/testData/class_/class/oneStaticMethod.jav @@ -0,0 +1 @@ +final class S { static boolean staticF() { return true; } } \ No newline at end of file diff --git a/testData/class_/class/oneStaticMethod.kt b/testData/class_/class/oneStaticMethod.kt new file mode 100644 index 00000000000..0b95364abcf --- /dev/null +++ b/testData/class_/class/oneStaticMethod.kt @@ -0,0 +1 @@ +class S { class object { fun staticF() : Boolean { return true } } } \ No newline at end of file diff --git a/testData/class_/class/oneStaticMethodOneNonStatic.jav b/testData/class_/class/oneStaticMethodOneNonStatic.jav new file mode 100644 index 00000000000..4c6915861c5 --- /dev/null +++ b/testData/class_/class/oneStaticMethodOneNonStatic.jav @@ -0,0 +1 @@ +final class S { boolean sB() { return true; } static int sI() { return 1; } } \ No newline at end of file diff --git a/testData/class_/class/oneStaticMethodOneNonStatic.kt b/testData/class_/class/oneStaticMethodOneNonStatic.kt new file mode 100644 index 00000000000..ba3e67dd26e --- /dev/null +++ b/testData/class_/class/oneStaticMethodOneNonStatic.kt @@ -0,0 +1 @@ +class S { class object { fun sI() : Int { return 1 } } fun sB() : Boolean { return true } } \ No newline at end of file diff --git a/testData/class_/class/pivateClass.jav b/testData/class_/class/pivateClass.jav new file mode 100644 index 00000000000..91cc7a0e937 --- /dev/null +++ b/testData/class_/class/pivateClass.jav @@ -0,0 +1 @@ +private class Test {} \ No newline at end of file diff --git a/testData/class_/class/pivateClass.kt b/testData/class_/class/pivateClass.kt new file mode 100644 index 00000000000..8f0cfde9556 --- /dev/null +++ b/testData/class_/class/pivateClass.kt @@ -0,0 +1 @@ +private open class Test { } \ No newline at end of file diff --git a/testData/class_/class/protectedClass.jav b/testData/class_/class/protectedClass.jav new file mode 100644 index 00000000000..d27e53f5081 --- /dev/null +++ b/testData/class_/class/protectedClass.jav @@ -0,0 +1 @@ +protected class Test {} \ No newline at end of file diff --git a/testData/class_/class/protectedClass.kt b/testData/class_/class/protectedClass.kt new file mode 100644 index 00000000000..2f626ef896b --- /dev/null +++ b/testData/class_/class/protectedClass.kt @@ -0,0 +1 @@ +protected open class Test { } \ No newline at end of file diff --git a/testData/class_/class/publicClass.jav b/testData/class_/class/publicClass.jav new file mode 100644 index 00000000000..099aac22fd3 --- /dev/null +++ b/testData/class_/class/publicClass.jav @@ -0,0 +1 @@ +public class Test {} \ No newline at end of file diff --git a/testData/class_/class/publicClass.kt b/testData/class_/class/publicClass.kt new file mode 100644 index 00000000000..ec3ccb82f12 --- /dev/null +++ b/testData/class_/class/publicClass.kt @@ -0,0 +1 @@ +public open class Test { } \ No newline at end of file diff --git a/testData/class_/class/simpleInheritance.jav b/testData/class_/class/simpleInheritance.jav new file mode 100644 index 00000000000..01916ab4d7b --- /dev/null +++ b/testData/class_/class/simpleInheritance.jav @@ -0,0 +1 @@ +final class A extends Base {} \ No newline at end of file diff --git a/testData/class_/class/simpleInheritance.kt b/testData/class_/class/simpleInheritance.kt new file mode 100644 index 00000000000..2aee0acad51 --- /dev/null +++ b/testData/class_/class/simpleInheritance.kt @@ -0,0 +1 @@ +class A : Base { } \ No newline at end of file diff --git a/testData/class_/class/twoStaticMethod.jav b/testData/class_/class/twoStaticMethod.jav new file mode 100644 index 00000000000..b69b1398e17 --- /dev/null +++ b/testData/class_/class/twoStaticMethod.jav @@ -0,0 +1 @@ +final class S { static boolean sB() { return true; } static int sI() { return 1; } } \ No newline at end of file diff --git a/testData/class_/class/twoStaticMethod.kt b/testData/class_/class/twoStaticMethod.kt new file mode 100644 index 00000000000..034258422aa --- /dev/null +++ b/testData/class_/class/twoStaticMethod.kt @@ -0,0 +1 @@ +class S { class object { fun sB() : Boolean { return true } fun sI() : Int { return 1 } } } \ No newline at end of file diff --git a/testData/class_/class_mult/classWithEmptyMethods.jav b/testData/class_/class_mult/classWithEmptyMethods.jav new file mode 100644 index 00000000000..49ec763ae8f --- /dev/null +++ b/testData/class_/class_mult/classWithEmptyMethods.jav @@ -0,0 +1 @@ +final class T {void main() {}int i() {}String s() {}} \ No newline at end of file diff --git a/testData/class_/class_mult/classWithEmptyMethods.kt b/testData/class_/class_mult/classWithEmptyMethods.kt new file mode 100644 index 00000000000..093b68e9c67 --- /dev/null +++ b/testData/class_/class_mult/classWithEmptyMethods.kt @@ -0,0 +1,8 @@ +class T { +fun main() : Unit { +} +fun i() : Int { +} +fun s() : String? { +} +} \ No newline at end of file diff --git a/testData/class_/class_mult/classWithFields.jav b/testData/class_/class_mult/classWithFields.jav new file mode 100644 index 00000000000..c7059937021 --- /dev/null +++ b/testData/class_/class_mult/classWithFields.jav @@ -0,0 +1 @@ +final class T {String a = "abc";int b = 10;} \ No newline at end of file diff --git a/testData/class_/class_mult/classWithFields.kt b/testData/class_/class_mult/classWithFields.kt new file mode 100644 index 00000000000..e4b83fcd5fa --- /dev/null +++ b/testData/class_/class_mult/classWithFields.kt @@ -0,0 +1,4 @@ +class T { +var a : String? = "abc" +var b : Int = 10 +} \ No newline at end of file diff --git a/testData/class_/class_mult/classWithMultiplyFields.jav b/testData/class_/class_mult/classWithMultiplyFields.jav new file mode 100644 index 00000000000..6fd5e1a9865 --- /dev/null +++ b/testData/class_/class_mult/classWithMultiplyFields.jav @@ -0,0 +1 @@ +final class T {String a, b, c = "abc";} \ No newline at end of file diff --git a/testData/class_/class_mult/classWithMultiplyFields.kt b/testData/class_/class_mult/classWithMultiplyFields.kt new file mode 100644 index 00000000000..43274e811c8 --- /dev/null +++ b/testData/class_/class_mult/classWithMultiplyFields.kt @@ -0,0 +1,5 @@ +class T { +var a : String? +var b : String? +var c : String? = "abc" +} \ No newline at end of file diff --git a/testData/conditionalExpression/expression_mult/simpleConditionalExpression.jav b/testData/conditionalExpression/expression_mult/simpleConditionalExpression.jav new file mode 100644 index 00000000000..3e742448544 --- /dev/null +++ b/testData/conditionalExpression/expression_mult/simpleConditionalExpression.jav @@ -0,0 +1 @@ +a.isEmpty() ? 0 : 1 \ No newline at end of file diff --git a/testData/conditionalExpression/expression_mult/simpleConditionalExpression.kt b/testData/conditionalExpression/expression_mult/simpleConditionalExpression.kt new file mode 100644 index 00000000000..85131998260 --- /dev/null +++ b/testData/conditionalExpression/expression_mult/simpleConditionalExpression.kt @@ -0,0 +1,4 @@ +(if (a.isEmpty()) +0 +else +1) \ No newline at end of file diff --git a/testData/continueStatement/statement/continueWithLabel.jav b/testData/continueStatement/statement/continueWithLabel.jav new file mode 100644 index 00000000000..aa7bbb7cd89 --- /dev/null +++ b/testData/continueStatement/statement/continueWithLabel.jav @@ -0,0 +1 @@ +continue label; \ No newline at end of file diff --git a/testData/continueStatement/statement/continueWithLabel.kt b/testData/continueStatement/statement/continueWithLabel.kt new file mode 100644 index 00000000000..9dc6020680e --- /dev/null +++ b/testData/continueStatement/statement/continueWithLabel.kt @@ -0,0 +1 @@ +continue@label \ No newline at end of file diff --git a/testData/continueStatement/statement/continueWithoutLabel.jav b/testData/continueStatement/statement/continueWithoutLabel.jav new file mode 100644 index 00000000000..45127c0ad12 --- /dev/null +++ b/testData/continueStatement/statement/continueWithoutLabel.jav @@ -0,0 +1 @@ +continue; \ No newline at end of file diff --git a/testData/continueStatement/statement/continueWithoutLabel.kt b/testData/continueStatement/statement/continueWithoutLabel.kt new file mode 100644 index 00000000000..b2960313c53 --- /dev/null +++ b/testData/continueStatement/statement/continueWithoutLabel.kt @@ -0,0 +1 @@ +continue \ No newline at end of file diff --git a/testData/declarationStatement/statement/singleFinalIntDeclaration.jav b/testData/declarationStatement/statement/singleFinalIntDeclaration.jav new file mode 100644 index 00000000000..79db42cfc1c --- /dev/null +++ b/testData/declarationStatement/statement/singleFinalIntDeclaration.jav @@ -0,0 +1 @@ +final int s; \ No newline at end of file diff --git a/testData/declarationStatement/statement/singleFinalIntDeclaration.kt b/testData/declarationStatement/statement/singleFinalIntDeclaration.kt new file mode 100644 index 00000000000..0ff0482bb0f --- /dev/null +++ b/testData/declarationStatement/statement/singleFinalIntDeclaration.kt @@ -0,0 +1 @@ +val s : Int \ No newline at end of file diff --git a/testData/declarationStatement/statement/singleFinalStringDeclaration.jav b/testData/declarationStatement/statement/singleFinalStringDeclaration.jav new file mode 100644 index 00000000000..0d5e93f00ff --- /dev/null +++ b/testData/declarationStatement/statement/singleFinalStringDeclaration.jav @@ -0,0 +1 @@ +final String s; \ No newline at end of file diff --git a/testData/declarationStatement/statement/singleFinalStringDeclaration.kt b/testData/declarationStatement/statement/singleFinalStringDeclaration.kt new file mode 100644 index 00000000000..734800a644c --- /dev/null +++ b/testData/declarationStatement/statement/singleFinalStringDeclaration.kt @@ -0,0 +1 @@ +val s : String? \ No newline at end of file diff --git a/testData/declarationStatement/statement/singleIntDeclaration.jav b/testData/declarationStatement/statement/singleIntDeclaration.jav new file mode 100644 index 00000000000..ee7cd0becae --- /dev/null +++ b/testData/declarationStatement/statement/singleIntDeclaration.jav @@ -0,0 +1 @@ +int s; \ No newline at end of file diff --git a/testData/declarationStatement/statement/singleIntDeclaration.kt b/testData/declarationStatement/statement/singleIntDeclaration.kt new file mode 100644 index 00000000000..3639cd90f4a --- /dev/null +++ b/testData/declarationStatement/statement/singleIntDeclaration.kt @@ -0,0 +1 @@ +var s : Int \ No newline at end of file diff --git a/testData/declarationStatement/statement/singleStringDeclaration.jav b/testData/declarationStatement/statement/singleStringDeclaration.jav new file mode 100644 index 00000000000..8f1adbb52a5 --- /dev/null +++ b/testData/declarationStatement/statement/singleStringDeclaration.jav @@ -0,0 +1 @@ +String s; \ No newline at end of file diff --git a/testData/declarationStatement/statement/singleStringDeclaration.kt b/testData/declarationStatement/statement/singleStringDeclaration.kt new file mode 100644 index 00000000000..4bdd5d14ca2 --- /dev/null +++ b/testData/declarationStatement/statement/singleStringDeclaration.kt @@ -0,0 +1 @@ +var s : String? \ No newline at end of file diff --git a/testData/declarationStatement/statement_mult/multiplyFinalIntDeclaration.jav b/testData/declarationStatement/statement_mult/multiplyFinalIntDeclaration.jav new file mode 100644 index 00000000000..42d4cea5522 --- /dev/null +++ b/testData/declarationStatement/statement_mult/multiplyFinalIntDeclaration.jav @@ -0,0 +1 @@ +final int k, l, m; \ No newline at end of file diff --git a/testData/declarationStatement/statement_mult/multiplyFinalIntDeclaration.kt b/testData/declarationStatement/statement_mult/multiplyFinalIntDeclaration.kt new file mode 100644 index 00000000000..08a84179833 --- /dev/null +++ b/testData/declarationStatement/statement_mult/multiplyFinalIntDeclaration.kt @@ -0,0 +1,3 @@ +val k : Int +val l : Int +val m : Int \ No newline at end of file diff --git a/testData/declarationStatement/statement_mult/multiplyIntDeclaration.jav b/testData/declarationStatement/statement_mult/multiplyIntDeclaration.jav new file mode 100644 index 00000000000..219f057f8f0 --- /dev/null +++ b/testData/declarationStatement/statement_mult/multiplyIntDeclaration.jav @@ -0,0 +1 @@ +int k, l, m; \ No newline at end of file diff --git a/testData/declarationStatement/statement_mult/multiplyIntDeclaration.kt b/testData/declarationStatement/statement_mult/multiplyIntDeclaration.kt new file mode 100644 index 00000000000..357bb10b11e --- /dev/null +++ b/testData/declarationStatement/statement_mult/multiplyIntDeclaration.kt @@ -0,0 +1,3 @@ +var k : Int +var l : Int +var m : Int \ No newline at end of file diff --git a/testData/doWhileStatement/statement_mult/whileWithBlock.jav b/testData/doWhileStatement/statement_mult/whileWithBlock.jav new file mode 100644 index 00000000000..48a9639a646 --- /dev/null +++ b/testData/doWhileStatement/statement_mult/whileWithBlock.jav @@ -0,0 +1 @@ +do {int i = 1; i = i + 1;} while (a > b) \ No newline at end of file diff --git a/testData/doWhileStatement/statement_mult/whileWithBlock.kt b/testData/doWhileStatement/statement_mult/whileWithBlock.kt new file mode 100644 index 00000000000..96ee36204cc --- /dev/null +++ b/testData/doWhileStatement/statement_mult/whileWithBlock.kt @@ -0,0 +1,6 @@ +do +{ +var i : Int = 1 +i = (i + 1) +} +while ((a > b)) \ No newline at end of file diff --git a/testData/doWhileStatement/statement_mult/whileWithEmptyBlock.jav b/testData/doWhileStatement/statement_mult/whileWithEmptyBlock.jav new file mode 100644 index 00000000000..b57bb051009 --- /dev/null +++ b/testData/doWhileStatement/statement_mult/whileWithEmptyBlock.jav @@ -0,0 +1 @@ +do {} while (true) \ No newline at end of file diff --git a/testData/doWhileStatement/statement_mult/whileWithEmptyBlock.kt b/testData/doWhileStatement/statement_mult/whileWithEmptyBlock.kt new file mode 100644 index 00000000000..7018b864e5e --- /dev/null +++ b/testData/doWhileStatement/statement_mult/whileWithEmptyBlock.kt @@ -0,0 +1,4 @@ +do +{ +} +while (true) \ No newline at end of file diff --git a/testData/doWhileStatement/statement_mult/whileWithExpression.jav b/testData/doWhileStatement/statement_mult/whileWithExpression.jav new file mode 100644 index 00000000000..e724468b028 --- /dev/null +++ b/testData/doWhileStatement/statement_mult/whileWithExpression.jav @@ -0,0 +1 @@ +do i = i + 1; while (true) \ No newline at end of file diff --git a/testData/doWhileStatement/statement_mult/whileWithExpression.kt b/testData/doWhileStatement/statement_mult/whileWithExpression.kt new file mode 100644 index 00000000000..c936946d560 --- /dev/null +++ b/testData/doWhileStatement/statement_mult/whileWithExpression.kt @@ -0,0 +1,3 @@ +do +i = (i + 1) +while (true) \ No newline at end of file diff --git a/testData/doWhileStatement/statement_mult/whileWithReturn.jav b/testData/doWhileStatement/statement_mult/whileWithReturn.jav new file mode 100644 index 00000000000..6ca0c6cd1b2 --- /dev/null +++ b/testData/doWhileStatement/statement_mult/whileWithReturn.jav @@ -0,0 +1 @@ +do return 1; while (true) \ No newline at end of file diff --git a/testData/doWhileStatement/statement_mult/whileWithReturn.kt b/testData/doWhileStatement/statement_mult/whileWithReturn.kt new file mode 100644 index 00000000000..21de9dff87a --- /dev/null +++ b/testData/doWhileStatement/statement_mult/whileWithReturn.kt @@ -0,0 +1,3 @@ +do +return 1 +while (true) \ No newline at end of file diff --git a/testData/enum/class/emptyEnum.jav b/testData/enum/class/emptyEnum.jav new file mode 100644 index 00000000000..6374d13e5e5 --- /dev/null +++ b/testData/enum/class/emptyEnum.jav @@ -0,0 +1 @@ +enum A {} \ No newline at end of file diff --git a/testData/enum/class/emptyEnum.kt b/testData/enum/class/emptyEnum.kt new file mode 100644 index 00000000000..ee5f5b8e52b --- /dev/null +++ b/testData/enum/class/emptyEnum.kt @@ -0,0 +1 @@ +enum A { } \ No newline at end of file diff --git a/testData/enum/class/enumImplementsOneInterface.jav b/testData/enum/class/enumImplementsOneInterface.jav new file mode 100644 index 00000000000..c2e20825bfe --- /dev/null +++ b/testData/enum/class/enumImplementsOneInterface.jav @@ -0,0 +1 @@ +enum A implements I {} \ No newline at end of file diff --git a/testData/enum/class/enumImplementsOneInterface.kt b/testData/enum/class/enumImplementsOneInterface.kt new file mode 100644 index 00000000000..9aaec583855 --- /dev/null +++ b/testData/enum/class/enumImplementsOneInterface.kt @@ -0,0 +1 @@ +enum A : I { } \ No newline at end of file diff --git a/testData/enum/class/enumImplementsSeveralInterfaces.jav b/testData/enum/class/enumImplementsSeveralInterfaces.jav new file mode 100644 index 00000000000..0334953a275 --- /dev/null +++ b/testData/enum/class/enumImplementsSeveralInterfaces.jav @@ -0,0 +1 @@ +enum A implements I0, I1, I2 {} \ No newline at end of file diff --git a/testData/enum/class/enumImplementsSeveralInterfaces.kt b/testData/enum/class/enumImplementsSeveralInterfaces.kt new file mode 100644 index 00000000000..4db3cfa0033 --- /dev/null +++ b/testData/enum/class/enumImplementsSeveralInterfaces.kt @@ -0,0 +1 @@ +enum A : I0, I1, I2 { } \ No newline at end of file diff --git a/testData/enum/class/internalEnum.jav b/testData/enum/class/internalEnum.jav new file mode 100644 index 00000000000..5ac159fa355 --- /dev/null +++ b/testData/enum/class/internalEnum.jav @@ -0,0 +1 @@ +enum Test {} \ No newline at end of file diff --git a/testData/enum/class/internalEnum.kt b/testData/enum/class/internalEnum.kt new file mode 100644 index 00000000000..a677a0e3d81 --- /dev/null +++ b/testData/enum/class/internalEnum.kt @@ -0,0 +1 @@ +enum Test { } \ No newline at end of file diff --git a/testData/enum/class/privateEnum.jav b/testData/enum/class/privateEnum.jav new file mode 100644 index 00000000000..963b14059d8 --- /dev/null +++ b/testData/enum/class/privateEnum.jav @@ -0,0 +1 @@ +private enum Test {} \ No newline at end of file diff --git a/testData/enum/class/privateEnum.kt b/testData/enum/class/privateEnum.kt new file mode 100644 index 00000000000..91956cea0d2 --- /dev/null +++ b/testData/enum/class/privateEnum.kt @@ -0,0 +1 @@ +private enum Test { } \ No newline at end of file diff --git a/testData/enum/class/protectedEnum.jav b/testData/enum/class/protectedEnum.jav new file mode 100644 index 00000000000..1361563477c --- /dev/null +++ b/testData/enum/class/protectedEnum.jav @@ -0,0 +1 @@ +protected enum Test {} \ No newline at end of file diff --git a/testData/enum/class/protectedEnum.kt b/testData/enum/class/protectedEnum.kt new file mode 100644 index 00000000000..00aaa1306e8 --- /dev/null +++ b/testData/enum/class/protectedEnum.kt @@ -0,0 +1 @@ +protected enum Test { } \ No newline at end of file diff --git a/testData/enum/class/publicEnum.jav b/testData/enum/class/publicEnum.jav new file mode 100644 index 00000000000..23365fc3853 --- /dev/null +++ b/testData/enum/class/publicEnum.jav @@ -0,0 +1 @@ +public enum Test {} \ No newline at end of file diff --git a/testData/enum/class/publicEnum.kt b/testData/enum/class/publicEnum.kt new file mode 100644 index 00000000000..86f25500c54 --- /dev/null +++ b/testData/enum/class/publicEnum.kt @@ -0,0 +1 @@ +public enum Test { } \ No newline at end of file diff --git a/testData/enum/class_mult/enumWithNameField.jav b/testData/enum/class_mult/enumWithNameField.jav new file mode 100644 index 00000000000..30f259ecb0f --- /dev/null +++ b/testData/enum/class_mult/enumWithNameField.jav @@ -0,0 +1 @@ +enum E { I; private String name; } \ No newline at end of file diff --git a/testData/enum/class_mult/enumWithNameField.kt b/testData/enum/class_mult/enumWithNameField.kt new file mode 100644 index 00000000000..eed3f7116a9 --- /dev/null +++ b/testData/enum/class_mult/enumWithNameField.kt @@ -0,0 +1,4 @@ +enum E { +I +private var name : String? +} \ No newline at end of file diff --git a/testData/enum/class_mult/fieldsWithPrimaryPrivateConstructor.jav b/testData/enum/class_mult/fieldsWithPrimaryPrivateConstructor.jav new file mode 100644 index 00000000000..416d02b7232 --- /dev/null +++ b/testData/enum/class_mult/fieldsWithPrimaryPrivateConstructor.jav @@ -0,0 +1,12 @@ +enum Color { + WHITE(21), BLACK(22), RED(23), YELLOW(24), BLUE(25); + + private int code; + + private Color(int c) { + code = c; + } + + public int getCode() { + return code; + } \ No newline at end of file diff --git a/testData/enum/class_mult/fieldsWithPrimaryPrivateConstructor.kt b/testData/enum/class_mult/fieldsWithPrimaryPrivateConstructor.kt new file mode 100644 index 00000000000..a6c5d2501b5 --- /dev/null +++ b/testData/enum/class_mult/fieldsWithPrimaryPrivateConstructor.kt @@ -0,0 +1,14 @@ +enum Color { +WHITE(21) +BLACK(22) +RED(23) +YELLOW(24) +BLUE(25) +private var code : Int +private (c : Int) { +code = c +} +public fun getCode() : Int { +return code +} +} \ No newline at end of file diff --git a/testData/enum/class_mult/overrideToString.jav b/testData/enum/class_mult/overrideToString.jav new file mode 100644 index 00000000000..e2aae14da6c --- /dev/null +++ b/testData/enum/class_mult/overrideToString.jav @@ -0,0 +1 @@ +enum Color { WHITE, BLACK, RED, YELLOW, BLUE;@Override String toString() { return "COLOR";}} \ No newline at end of file diff --git a/testData/enum/class_mult/overrideToString.kt b/testData/enum/class_mult/overrideToString.kt new file mode 100644 index 00000000000..783dd0b2444 --- /dev/null +++ b/testData/enum/class_mult/overrideToString.kt @@ -0,0 +1,10 @@ +enum Color { +WHITE +BLACK +RED +YELLOW +BLUE +override fun toString() : String? { +return "COLOR" +} +} \ No newline at end of file diff --git a/testData/enum/class_mult/runnableImplementation.jav b/testData/enum/class_mult/runnableImplementation.jav new file mode 100644 index 00000000000..b5f21ba6318 --- /dev/null +++ b/testData/enum/class_mult/runnableImplementation.jav @@ -0,0 +1,8 @@ +enum Color implements Runnable { + WHITE, BLACK, RED, YELLOW, BLUE; + + public void run() { + System.out.println("name()=" + name() + + ", toString()=" + toString()); + } +} \ No newline at end of file diff --git a/testData/enum/class_mult/runnableImplementation.kt b/testData/enum/class_mult/runnableImplementation.kt new file mode 100644 index 00000000000..912272d9e94 --- /dev/null +++ b/testData/enum/class_mult/runnableImplementation.kt @@ -0,0 +1,10 @@ +enum Color : Runnable { +WHITE +BLACK +RED +YELLOW +BLUE +override public fun run() : Unit { +System.out.println(("name()=" + name() + ", toString()=" + toString())) +} +} \ No newline at end of file diff --git a/testData/enum/class_mult/typeSafeEnum.jav b/testData/enum/class_mult/typeSafeEnum.jav new file mode 100644 index 00000000000..1ecc70526e4 --- /dev/null +++ b/testData/enum/class_mult/typeSafeEnum.jav @@ -0,0 +1 @@ +enum Coin { PENNY, NICKEL, DIME, QUARTER; } \ No newline at end of file diff --git a/testData/enum/class_mult/typeSafeEnum.kt b/testData/enum/class_mult/typeSafeEnum.kt new file mode 100644 index 00000000000..74de5694118 --- /dev/null +++ b/testData/enum/class_mult/typeSafeEnum.kt @@ -0,0 +1,6 @@ +enum Coin { +PENNY +NICKEL +DIME +QUARTER +} \ No newline at end of file diff --git a/testData/field/method/internalField.jav b/testData/field/method/internalField.jav new file mode 100644 index 00000000000..3f94302d50a --- /dev/null +++ b/testData/field/method/internalField.jav @@ -0,0 +1 @@ +Foo f; \ No newline at end of file diff --git a/testData/field/method/internalField.kt b/testData/field/method/internalField.kt new file mode 100644 index 00000000000..698afa74245 --- /dev/null +++ b/testData/field/method/internalField.kt @@ -0,0 +1 @@ +var f : Foo? \ No newline at end of file diff --git a/testData/field/method/privateField.jav b/testData/field/method/privateField.jav new file mode 100644 index 00000000000..bb102febdcd --- /dev/null +++ b/testData/field/method/privateField.jav @@ -0,0 +1 @@ +private Foo f; \ No newline at end of file diff --git a/testData/field/method/privateField.kt b/testData/field/method/privateField.kt new file mode 100644 index 00000000000..bdc2e2b5389 --- /dev/null +++ b/testData/field/method/privateField.kt @@ -0,0 +1 @@ +private var f : Foo? \ No newline at end of file diff --git a/testData/field/method/protectedField.jav b/testData/field/method/protectedField.jav new file mode 100644 index 00000000000..5fec6e8c145 --- /dev/null +++ b/testData/field/method/protectedField.jav @@ -0,0 +1 @@ +protected Foo f; \ No newline at end of file diff --git a/testData/field/method/protectedField.kt b/testData/field/method/protectedField.kt new file mode 100644 index 00000000000..1ce1567cdc0 --- /dev/null +++ b/testData/field/method/protectedField.kt @@ -0,0 +1 @@ +protected var f : Foo? \ No newline at end of file diff --git a/testData/field/method/publicField.jav b/testData/field/method/publicField.jav new file mode 100644 index 00000000000..7f46379cf3d --- /dev/null +++ b/testData/field/method/publicField.jav @@ -0,0 +1 @@ +public Foo f; \ No newline at end of file diff --git a/testData/field/method/publicField.kt b/testData/field/method/publicField.kt new file mode 100644 index 00000000000..143ef31b5c8 --- /dev/null +++ b/testData/field/method/publicField.kt @@ -0,0 +1 @@ +public var f : Foo? \ No newline at end of file diff --git a/testData/field/method/valWithInit.jav b/testData/field/method/valWithInit.jav new file mode 100644 index 00000000000..085241a9e9d --- /dev/null +++ b/testData/field/method/valWithInit.jav @@ -0,0 +1 @@ +final Foo f = new Foo(1, 2); \ No newline at end of file diff --git a/testData/field/method/valWithInit.kt b/testData/field/method/valWithInit.kt new file mode 100644 index 00000000000..a737faf3351 --- /dev/null +++ b/testData/field/method/valWithInit.kt @@ -0,0 +1 @@ +val f : Foo? = Foo(1, 2) \ No newline at end of file diff --git a/testData/field/method/varWithInit.jav b/testData/field/method/varWithInit.jav new file mode 100644 index 00000000000..ac2b8d54bd4 --- /dev/null +++ b/testData/field/method/varWithInit.jav @@ -0,0 +1 @@ +Foo f = new Foo(1, 2); \ No newline at end of file diff --git a/testData/field/method/varWithInit.kt b/testData/field/method/varWithInit.kt new file mode 100644 index 00000000000..996f5072c1b --- /dev/null +++ b/testData/field/method/varWithInit.kt @@ -0,0 +1 @@ +var f : Foo? = Foo(1, 2) \ No newline at end of file diff --git a/testData/field/method/varWithoutInit.jav b/testData/field/method/varWithoutInit.jav new file mode 100644 index 00000000000..3f94302d50a --- /dev/null +++ b/testData/field/method/varWithoutInit.jav @@ -0,0 +1 @@ +Foo f; \ No newline at end of file diff --git a/testData/field/method/varWithoutInit.kt b/testData/field/method/varWithoutInit.kt new file mode 100644 index 00000000000..698afa74245 --- /dev/null +++ b/testData/field/method/varWithoutInit.kt @@ -0,0 +1 @@ +var f : Foo? \ No newline at end of file diff --git a/testData/file_/file/packageWithClass.jav b/testData/file_/file/packageWithClass.jav new file mode 100644 index 00000000000..3524ce7525c --- /dev/null +++ b/testData/file_/file/packageWithClass.jav @@ -0,0 +1 @@ +package test; final class C {} \ No newline at end of file diff --git a/testData/file_/file/packageWithClass.kt b/testData/file_/file/packageWithClass.kt new file mode 100644 index 00000000000..399e3faa127 --- /dev/null +++ b/testData/file_/file/packageWithClass.kt @@ -0,0 +1 @@ +namespace test { class C { } } \ No newline at end of file diff --git a/testData/file_/file/packageWithClasses.jav b/testData/file_/file/packageWithClasses.jav new file mode 100644 index 00000000000..d0964b8ccb5 --- /dev/null +++ b/testData/file_/file/packageWithClasses.jav @@ -0,0 +1 @@ +final class A {} final class B {} \ No newline at end of file diff --git a/testData/file_/file/packageWithClasses.kt b/testData/file_/file/packageWithClasses.kt new file mode 100644 index 00000000000..b5c20e59452 --- /dev/null +++ b/testData/file_/file/packageWithClasses.kt @@ -0,0 +1 @@ +namespace { class A { } class B { } } \ No newline at end of file diff --git a/testData/file_/file/packageWithOpenClass.jav b/testData/file_/file/packageWithOpenClass.jav new file mode 100644 index 00000000000..821bbec2b3d --- /dev/null +++ b/testData/file_/file/packageWithOpenClass.jav @@ -0,0 +1 @@ +package test; class C {} \ No newline at end of file diff --git a/testData/file_/file/packageWithOpenClass.kt b/testData/file_/file/packageWithOpenClass.kt new file mode 100644 index 00000000000..3b7f5a190e6 --- /dev/null +++ b/testData/file_/file/packageWithOpenClass.kt @@ -0,0 +1 @@ +namespace test { open class C { } } \ No newline at end of file diff --git a/testData/file_/file_mult/packageWithImports.jav b/testData/file_/file_mult/packageWithImports.jav new file mode 100644 index 00000000000..94a969cfe93 --- /dev/null +++ b/testData/file_/file_mult/packageWithImports.jav @@ -0,0 +1 @@ +package test;import ast;import ast2; \ No newline at end of file diff --git a/testData/file_/file_mult/packageWithImports.kt b/testData/file_/file_mult/packageWithImports.kt new file mode 100644 index 00000000000..1cb4a91ba46 --- /dev/null +++ b/testData/file_/file_mult/packageWithImports.kt @@ -0,0 +1,4 @@ +namespace test { +import ast +import ast2 +} \ No newline at end of file diff --git a/testData/file_/file_mult/packageWithMixedImports.jav b/testData/file_/file_mult/packageWithMixedImports.jav new file mode 100644 index 00000000000..6296e224258 --- /dev/null +++ b/testData/file_/file_mult/packageWithMixedImports.jav @@ -0,0 +1 @@ +package test;import static ast;import ast2; \ No newline at end of file diff --git a/testData/file_/file_mult/packageWithMixedImports.kt b/testData/file_/file_mult/packageWithMixedImports.kt new file mode 100644 index 00000000000..1cb4a91ba46 --- /dev/null +++ b/testData/file_/file_mult/packageWithMixedImports.kt @@ -0,0 +1,4 @@ +namespace test { +import ast +import ast2 +} \ No newline at end of file diff --git a/testData/file_/file_mult/packageWithStaticImports.jav b/testData/file_/file_mult/packageWithStaticImports.jav new file mode 100644 index 00000000000..0d1bea3ba5a --- /dev/null +++ b/testData/file_/file_mult/packageWithStaticImports.jav @@ -0,0 +1 @@ +package test;import static ast;import static ast2; \ No newline at end of file diff --git a/testData/file_/file_mult/packageWithStaticImports.kt b/testData/file_/file_mult/packageWithStaticImports.kt new file mode 100644 index 00000000000..1cb4a91ba46 --- /dev/null +++ b/testData/file_/file_mult/packageWithStaticImports.kt @@ -0,0 +1,4 @@ +namespace test { +import ast +import ast2 +} \ No newline at end of file diff --git a/testData/for/statement_mult/commonCaseForTest.jav b/testData/for/statement_mult/commonCaseForTest.jav new file mode 100644 index 00000000000..0ea98e4b45f --- /dev/null +++ b/testData/for/statement_mult/commonCaseForTest.jav @@ -0,0 +1 @@ +for (init(); condition(); update()) body(); \ No newline at end of file diff --git a/testData/for/statement_mult/commonCaseForTest.kt b/testData/for/statement_mult/commonCaseForTest.kt new file mode 100644 index 00000000000..0fab59caf33 --- /dev/null +++ b/testData/for/statement_mult/commonCaseForTest.kt @@ -0,0 +1,10 @@ +{ +init() +while (condition()) +{ +body() +{ +update() +} +} +} \ No newline at end of file diff --git a/testData/for/statement_mult/forWithBlock.jav b/testData/for/statement_mult/forWithBlock.jav new file mode 100644 index 00000000000..b470371f4a3 --- /dev/null +++ b/testData/for/statement_mult/forWithBlock.jav @@ -0,0 +1 @@ +for (int i = 0; i < 0; i++) {int i = 1; i++;} \ No newline at end of file diff --git a/testData/for/statement_mult/forWithBlock.kt b/testData/for/statement_mult/forWithBlock.kt new file mode 100644 index 00000000000..2ed9ae1e9a0 --- /dev/null +++ b/testData/for/statement_mult/forWithBlock.kt @@ -0,0 +1,13 @@ +{ +var i : Int = 0 +while ((i < 0)) +{ +{ +var i : Int = 1 +(i++) +} +{ +(i++) +} +} +} \ No newline at end of file diff --git a/testData/for/statement_mult/forWithBlockAndDoubleUpdate.jav b/testData/for/statement_mult/forWithBlockAndDoubleUpdate.jav new file mode 100644 index 00000000000..6c7c9e0e210 --- /dev/null +++ b/testData/for/statement_mult/forWithBlockAndDoubleUpdate.jav @@ -0,0 +1 @@ +for (int i = 0; i < 0; j++, i++) {int i = 1; i++;} \ No newline at end of file diff --git a/testData/for/statement_mult/forWithBlockAndDoubleUpdate.kt b/testData/for/statement_mult/forWithBlockAndDoubleUpdate.kt new file mode 100644 index 00000000000..5c7a0168951 --- /dev/null +++ b/testData/for/statement_mult/forWithBlockAndDoubleUpdate.kt @@ -0,0 +1,14 @@ +{ +var i : Int = 0 +while ((i < 0)) +{ +{ +var i : Int = 1 +(i++) +} +{ +(j++) +(i++) +} +} +} \ No newline at end of file diff --git a/testData/for/statement_mult/forWithEmptyBlock.jav b/testData/for/statement_mult/forWithEmptyBlock.jav new file mode 100644 index 00000000000..35fa13bac7b --- /dev/null +++ b/testData/for/statement_mult/forWithEmptyBlock.jav @@ -0,0 +1 @@ +for (int i = 0; i < 0; j++, i++) {} \ No newline at end of file diff --git a/testData/for/statement_mult/forWithEmptyBlock.kt b/testData/for/statement_mult/forWithEmptyBlock.kt new file mode 100644 index 00000000000..8ec3c763bf8 --- /dev/null +++ b/testData/for/statement_mult/forWithEmptyBlock.kt @@ -0,0 +1,12 @@ +{ +var i : Int = 0 +while ((i < 0)) +{ +{ +} +{ +(j++) +(i++) +} +} +} \ No newline at end of file diff --git a/testData/for/statement_mult/forWithExpression.jav b/testData/for/statement_mult/forWithExpression.jav new file mode 100644 index 00000000000..fc006f06703 --- /dev/null +++ b/testData/for/statement_mult/forWithExpression.jav @@ -0,0 +1 @@ +for (int i = 0; i < 0; i++) t++; \ No newline at end of file diff --git a/testData/for/statement_mult/forWithExpression.kt b/testData/for/statement_mult/forWithExpression.kt new file mode 100644 index 00000000000..2fa4c89935e --- /dev/null +++ b/testData/for/statement_mult/forWithExpression.kt @@ -0,0 +1,10 @@ +{ +var i : Int = 0 +while ((i < 0)) +{ +(t++) +{ +(i++) +} +} +} \ No newline at end of file diff --git a/testData/for/statement_mult/forWithReturn.jav b/testData/for/statement_mult/forWithReturn.jav new file mode 100644 index 00000000000..9a439dfe876 --- /dev/null +++ b/testData/for/statement_mult/forWithReturn.jav @@ -0,0 +1 @@ +for (int i = 0; i < 0; j++, i++) return i; \ No newline at end of file diff --git a/testData/for/statement_mult/forWithReturn.kt b/testData/for/statement_mult/forWithReturn.kt new file mode 100644 index 00000000000..d7c34312768 --- /dev/null +++ b/testData/for/statement_mult/forWithReturn.kt @@ -0,0 +1,11 @@ +{ +var i : Int = 0 +while ((i < 0)) +{ +return i +{ +(j++) +(i++) +} +} +} \ No newline at end of file diff --git a/testData/foreachStatement/statement_mult/enhancedForWithBlock.jav b/testData/foreachStatement/statement_mult/enhancedForWithBlock.jav new file mode 100644 index 00000000000..8657e2d8f9c --- /dev/null +++ b/testData/foreachStatement/statement_mult/enhancedForWithBlock.jav @@ -0,0 +1 @@ +for (Node n : list) {int i = 1; i++;} \ No newline at end of file diff --git a/testData/foreachStatement/statement_mult/enhancedForWithBlock.kt b/testData/foreachStatement/statement_mult/enhancedForWithBlock.kt new file mode 100644 index 00000000000..06e9f5653fd --- /dev/null +++ b/testData/foreachStatement/statement_mult/enhancedForWithBlock.kt @@ -0,0 +1,5 @@ +for (n : Node? in list) +{ +var i : Int = 1 +(i++) +} \ No newline at end of file diff --git a/testData/foreachStatement/statement_mult/enhancedForWithEmptyBlock.jav b/testData/foreachStatement/statement_mult/enhancedForWithEmptyBlock.jav new file mode 100644 index 00000000000..225aecfb59c --- /dev/null +++ b/testData/foreachStatement/statement_mult/enhancedForWithEmptyBlock.jav @@ -0,0 +1 @@ +for (Node n : list) {} \ No newline at end of file diff --git a/testData/foreachStatement/statement_mult/enhancedForWithEmptyBlock.kt b/testData/foreachStatement/statement_mult/enhancedForWithEmptyBlock.kt new file mode 100644 index 00000000000..96f7cee4323 --- /dev/null +++ b/testData/foreachStatement/statement_mult/enhancedForWithEmptyBlock.kt @@ -0,0 +1,3 @@ +for (n : Node? in list) +{ +} \ No newline at end of file diff --git a/testData/foreachStatement/statement_mult/enhancedForWithExpression.jav b/testData/foreachStatement/statement_mult/enhancedForWithExpression.jav new file mode 100644 index 00000000000..22e30e2879e --- /dev/null +++ b/testData/foreachStatement/statement_mult/enhancedForWithExpression.jav @@ -0,0 +1 @@ +for (Node n : list) i++; \ No newline at end of file diff --git a/testData/foreachStatement/statement_mult/enhancedForWithExpression.kt b/testData/foreachStatement/statement_mult/enhancedForWithExpression.kt new file mode 100644 index 00000000000..b2135910585 --- /dev/null +++ b/testData/foreachStatement/statement_mult/enhancedForWithExpression.kt @@ -0,0 +1,2 @@ +for (n : Node? in list) +(i++) \ No newline at end of file diff --git a/testData/foreachStatement/statement_mult/enhancedForWithReturn.jav b/testData/foreachStatement/statement_mult/enhancedForWithReturn.jav new file mode 100644 index 00000000000..59409790376 --- /dev/null +++ b/testData/foreachStatement/statement_mult/enhancedForWithReturn.jav @@ -0,0 +1 @@ +for (Node n : list) return n; \ No newline at end of file diff --git a/testData/foreachStatement/statement_mult/enhancedForWithReturn.kt b/testData/foreachStatement/statement_mult/enhancedForWithReturn.kt new file mode 100644 index 00000000000..cb66b9552f4 --- /dev/null +++ b/testData/foreachStatement/statement_mult/enhancedForWithReturn.kt @@ -0,0 +1,2 @@ +for (n : Node? in list) +return n \ No newline at end of file diff --git a/testData/function/file/override.jav b/testData/function/file/override.jav new file mode 100644 index 00000000000..63a319a053c --- /dev/null +++ b/testData/function/file/override.jav @@ -0,0 +1 @@ +class A {void a() {}} final class B extends A {void a() {}} \ No newline at end of file diff --git a/testData/function/file/override.kt b/testData/function/file/override.kt new file mode 100644 index 00000000000..0d941e24a2d --- /dev/null +++ b/testData/function/file/override.kt @@ -0,0 +1 @@ +namespace { open class A { fun a() : Unit { } } class B : A { override fun a() : Unit { } } } \ No newline at end of file diff --git a/testData/function/method/classGenericParam.jav b/testData/function/method/classGenericParam.jav new file mode 100644 index 00000000000..ec2f1534b58 --- /dev/null +++ b/testData/function/method/classGenericParam.jav @@ -0,0 +1 @@ +T getT() {} \ No newline at end of file diff --git a/testData/function/method/classGenericParam.kt b/testData/function/method/classGenericParam.kt new file mode 100644 index 00000000000..7f936986c02 --- /dev/null +++ b/testData/function/method/classGenericParam.kt @@ -0,0 +1 @@ +fun getT() : T? { } \ No newline at end of file diff --git a/testData/function/method/emptyVoidMethod.jav b/testData/function/method/emptyVoidMethod.jav new file mode 100644 index 00000000000..05a37e98348 --- /dev/null +++ b/testData/function/method/emptyVoidMethod.jav @@ -0,0 +1 @@ +void main() {} \ No newline at end of file diff --git a/testData/function/method/emptyVoidMethod.kt b/testData/function/method/emptyVoidMethod.kt new file mode 100644 index 00000000000..93eff2fa681 --- /dev/null +++ b/testData/function/method/emptyVoidMethod.kt @@ -0,0 +1 @@ +fun main() : Unit { } \ No newline at end of file diff --git a/testData/function/method/internal.jav b/testData/function/method/internal.jav new file mode 100644 index 00000000000..48b8cb32a8b --- /dev/null +++ b/testData/function/method/internal.jav @@ -0,0 +1 @@ +void test() {} \ No newline at end of file diff --git a/testData/function/method/internal.kt b/testData/function/method/internal.kt new file mode 100644 index 00000000000..8155b96fa2f --- /dev/null +++ b/testData/function/method/internal.kt @@ -0,0 +1 @@ +fun test() : Unit { } \ No newline at end of file diff --git a/testData/function/method/methodClassType.jav b/testData/function/method/methodClassType.jav new file mode 100644 index 00000000000..ad93979b6fc --- /dev/null +++ b/testData/function/method/methodClassType.jav @@ -0,0 +1 @@ +String main() {} \ No newline at end of file diff --git a/testData/function/method/methodClassType.kt b/testData/function/method/methodClassType.kt new file mode 100644 index 00000000000..a501cae6c7c --- /dev/null +++ b/testData/function/method/methodClassType.kt @@ -0,0 +1 @@ +fun main() : String? { } \ No newline at end of file diff --git a/testData/function/method/methodPrimitiveType.jav b/testData/function/method/methodPrimitiveType.jav new file mode 100644 index 00000000000..c272dabaeb6 --- /dev/null +++ b/testData/function/method/methodPrimitiveType.jav @@ -0,0 +1 @@ +int main() {} \ No newline at end of file diff --git a/testData/function/method/methodPrimitiveType.kt b/testData/function/method/methodPrimitiveType.kt new file mode 100644 index 00000000000..ee968dfc778 --- /dev/null +++ b/testData/function/method/methodPrimitiveType.kt @@ -0,0 +1 @@ +fun main() : Int { } \ No newline at end of file diff --git a/testData/function/method/methodPrimitiveType2.jav b/testData/function/method/methodPrimitiveType2.jav new file mode 100644 index 00000000000..0539f74aaef --- /dev/null +++ b/testData/function/method/methodPrimitiveType2.jav @@ -0,0 +1 @@ +boolean main() {} \ No newline at end of file diff --git a/testData/function/method/methodPrimitiveType2.kt b/testData/function/method/methodPrimitiveType2.kt new file mode 100644 index 00000000000..30327d5bfd0 --- /dev/null +++ b/testData/function/method/methodPrimitiveType2.kt @@ -0,0 +1 @@ +fun main() : Boolean { } \ No newline at end of file diff --git a/testData/function/method/methodWithReturnStatement.jav b/testData/function/method/methodWithReturnStatement.jav new file mode 100644 index 00000000000..1b02cbaa290 --- /dev/null +++ b/testData/function/method/methodWithReturnStatement.jav @@ -0,0 +1 @@ +boolean isTrue() { return true; } \ No newline at end of file diff --git a/testData/function/method/methodWithReturnStatement.kt b/testData/function/method/methodWithReturnStatement.kt new file mode 100644 index 00000000000..641bd3e4f6e --- /dev/null +++ b/testData/function/method/methodWithReturnStatement.kt @@ -0,0 +1 @@ +fun isTrue() : Boolean { return true } \ No newline at end of file diff --git a/testData/function/method/ownGenericParam.jav b/testData/function/method/ownGenericParam.jav new file mode 100644 index 00000000000..3b651cfda09 --- /dev/null +++ b/testData/function/method/ownGenericParam.jav @@ -0,0 +1 @@ + void putU(U u) {} \ No newline at end of file diff --git a/testData/function/method/ownGenericParam.kt b/testData/function/method/ownGenericParam.kt new file mode 100644 index 00000000000..bcc017c4dcc --- /dev/null +++ b/testData/function/method/ownGenericParam.kt @@ -0,0 +1 @@ +fun putU(u : U?) : Unit { } \ No newline at end of file diff --git a/testData/function/method/ownSeveralGenericParams.jav b/testData/function/method/ownSeveralGenericParams.jav new file mode 100644 index 00000000000..3af41393000 --- /dev/null +++ b/testData/function/method/ownSeveralGenericParams.jav @@ -0,0 +1 @@ + void putUVW(U u, V v, W w) {} \ No newline at end of file diff --git a/testData/function/method/ownSeveralGenericParams.kt b/testData/function/method/ownSeveralGenericParams.kt new file mode 100644 index 00000000000..6fd24774822 --- /dev/null +++ b/testData/function/method/ownSeveralGenericParams.kt @@ -0,0 +1 @@ +fun putUVW(u : U?, v : V?, w : W?) : Unit { } \ No newline at end of file diff --git a/testData/function/method/private.jav b/testData/function/method/private.jav new file mode 100644 index 00000000000..823fbd1e89e --- /dev/null +++ b/testData/function/method/private.jav @@ -0,0 +1 @@ +private void test() {} \ No newline at end of file diff --git a/testData/function/method/private.kt b/testData/function/method/private.kt new file mode 100644 index 00000000000..f71b1d7c6c8 --- /dev/null +++ b/testData/function/method/private.kt @@ -0,0 +1 @@ +private fun test() : Unit { } \ No newline at end of file diff --git a/testData/function/method/protected.jav b/testData/function/method/protected.jav new file mode 100644 index 00000000000..ab7575a6ed6 --- /dev/null +++ b/testData/function/method/protected.jav @@ -0,0 +1 @@ +protected void test() {} \ No newline at end of file diff --git a/testData/function/method/protected.kt b/testData/function/method/protected.kt new file mode 100644 index 00000000000..e03000581bc --- /dev/null +++ b/testData/function/method/protected.kt @@ -0,0 +1 @@ +protected fun test() : Unit { } \ No newline at end of file diff --git a/testData/function/method/public.jav b/testData/function/method/public.jav new file mode 100644 index 00000000000..db620e22298 --- /dev/null +++ b/testData/function/method/public.jav @@ -0,0 +1 @@ +public void test() {} \ No newline at end of file diff --git a/testData/function/method/public.kt b/testData/function/method/public.kt new file mode 100644 index 00000000000..6e8c3855f6c --- /dev/null +++ b/testData/function/method/public.kt @@ -0,0 +1 @@ +public fun test() : Unit { } \ No newline at end of file diff --git a/testData/ifStatement/statement_mult/ifStatementWithEmptyBlocks.jav b/testData/ifStatement/statement_mult/ifStatementWithEmptyBlocks.jav new file mode 100644 index 00000000000..3690c79ad62 --- /dev/null +++ b/testData/ifStatement/statement_mult/ifStatementWithEmptyBlocks.jav @@ -0,0 +1 @@ +if (1 > 0) {} else {} \ No newline at end of file diff --git a/testData/ifStatement/statement_mult/ifStatementWithEmptyBlocks.kt b/testData/ifStatement/statement_mult/ifStatementWithEmptyBlocks.kt new file mode 100644 index 00000000000..6cff12d424b --- /dev/null +++ b/testData/ifStatement/statement_mult/ifStatementWithEmptyBlocks.kt @@ -0,0 +1,6 @@ +if ((1 > 0)) +{ +} +else +{ +} \ No newline at end of file diff --git a/testData/ifStatement/statement_mult/ifStatementWithMultilineBlocks.jav b/testData/ifStatement/statement_mult/ifStatementWithMultilineBlocks.jav new file mode 100644 index 00000000000..5546ee07bcf --- /dev/null +++ b/testData/ifStatement/statement_mult/ifStatementWithMultilineBlocks.jav @@ -0,0 +1 @@ +if (1 > 0) {int n = 1; return n;} else {return 0;} \ No newline at end of file diff --git a/testData/ifStatement/statement_mult/ifStatementWithMultilineBlocks.kt b/testData/ifStatement/statement_mult/ifStatementWithMultilineBlocks.kt new file mode 100644 index 00000000000..03496fee3ad --- /dev/null +++ b/testData/ifStatement/statement_mult/ifStatementWithMultilineBlocks.kt @@ -0,0 +1,9 @@ +if ((1 > 0)) +{ +var n : Int = 1 +return n +} +else +{ +return 0 +} \ No newline at end of file diff --git a/testData/ifStatement/statement_mult/ifStatementWithOneLineBlocks.jav b/testData/ifStatement/statement_mult/ifStatementWithOneLineBlocks.jav new file mode 100644 index 00000000000..c772469d2d2 --- /dev/null +++ b/testData/ifStatement/statement_mult/ifStatementWithOneLineBlocks.jav @@ -0,0 +1 @@ +if (true) return 1; else return 0; \ No newline at end of file diff --git a/testData/ifStatement/statement_mult/ifStatementWithOneLineBlocks.kt b/testData/ifStatement/statement_mult/ifStatementWithOneLineBlocks.kt new file mode 100644 index 00000000000..923c0d36318 --- /dev/null +++ b/testData/ifStatement/statement_mult/ifStatementWithOneLineBlocks.kt @@ -0,0 +1,4 @@ +if (true) +return 1 +else +return 0 \ No newline at end of file diff --git a/testData/ifStatement/statement_mult/ifStatementWithoutElse.jav b/testData/ifStatement/statement_mult/ifStatementWithoutElse.jav new file mode 100644 index 00000000000..d4814fbe107 --- /dev/null +++ b/testData/ifStatement/statement_mult/ifStatementWithoutElse.jav @@ -0,0 +1 @@ +if (1 > 0) {int n = 1; return n;} \ No newline at end of file diff --git a/testData/ifStatement/statement_mult/ifStatementWithoutElse.kt b/testData/ifStatement/statement_mult/ifStatementWithoutElse.kt new file mode 100644 index 00000000000..a8e52d980ec --- /dev/null +++ b/testData/ifStatement/statement_mult/ifStatementWithoutElse.kt @@ -0,0 +1,5 @@ +if ((1 > 0)) +{ +var n : Int = 1 +return n +} \ No newline at end of file diff --git a/testData/inProjectionType/method/methodParams.jav b/testData/inProjectionType/method/methodParams.jav new file mode 100644 index 00000000000..63b9ff6d6b7 --- /dev/null +++ b/testData/inProjectionType/method/methodParams.jav @@ -0,0 +1 @@ +void popAll(Collection dst) {} \ No newline at end of file diff --git a/testData/inProjectionType/method/methodParams.kt b/testData/inProjectionType/method/methodParams.kt new file mode 100644 index 00000000000..8073329f038 --- /dev/null +++ b/testData/inProjectionType/method/methodParams.kt @@ -0,0 +1 @@ +fun popAll(dst : Collection?) : Unit { } \ No newline at end of file diff --git a/testData/isOperator/expression_mult/complicatedExpression.jav b/testData/isOperator/expression_mult/complicatedExpression.jav new file mode 100644 index 00000000000..8840a8af77b --- /dev/null +++ b/testData/isOperator/expression_mult/complicatedExpression.jav @@ -0,0 +1 @@ +c.getType().getName() instanceof String \ No newline at end of file diff --git a/testData/isOperator/expression_mult/complicatedExpression.kt b/testData/isOperator/expression_mult/complicatedExpression.kt new file mode 100644 index 00000000000..3105c369fbe --- /dev/null +++ b/testData/isOperator/expression_mult/complicatedExpression.kt @@ -0,0 +1 @@ +(c.getType().getName() is String?) \ No newline at end of file diff --git a/testData/isOperator/expression_mult/simpleReference.jav b/testData/isOperator/expression_mult/simpleReference.jav new file mode 100644 index 00000000000..2cd30e5adf2 --- /dev/null +++ b/testData/isOperator/expression_mult/simpleReference.jav @@ -0,0 +1 @@ +a instanceof String \ No newline at end of file diff --git a/testData/isOperator/expression_mult/simpleReference.kt b/testData/isOperator/expression_mult/simpleReference.kt new file mode 100644 index 00000000000..544cd7f6728 --- /dev/null +++ b/testData/isOperator/expression_mult/simpleReference.kt @@ -0,0 +1 @@ +(a is String?) \ No newline at end of file diff --git a/testData/labelStatement/statement_mult/complicatedExampleFromJavaTutorial.jav b/testData/labelStatement/statement_mult/complicatedExampleFromJavaTutorial.jav new file mode 100644 index 00000000000..5c8ac99dd07 --- /dev/null +++ b/testData/labelStatement/statement_mult/complicatedExampleFromJavaTutorial.jav @@ -0,0 +1 @@ + test: for (int i = 0; i <= max; i++) { int n = substring.length(); int j = i; int k = 0; while (n-- != 0) { if (searchMe.charAt(j++) != substring.charAt(k++)) { continue test; } } foundIt = true; break test; } System.out.println(foundIt ? "Found it" : "Didn't find it"); }} \ No newline at end of file diff --git a/testData/labelStatement/statement_mult/complicatedExampleFromJavaTutorial.kt b/testData/labelStatement/statement_mult/complicatedExampleFromJavaTutorial.kt new file mode 100644 index 00000000000..9451018950a --- /dev/null +++ b/testData/labelStatement/statement_mult/complicatedExampleFromJavaTutorial.kt @@ -0,0 +1,27 @@ +@test { +var i : Int = 0 +while ((i <= max)) +{ +{ +var n : Int = substring.length() +var j : Int = i +var k : Int = 0 +while (((n--) != 0)) +{ +if ((searchMe.charAt((j++)) != substring.charAt((k++)))) +{ +continue@test +} +} +foundIt = true +break@test +} +{ +(i++) +} +} +} +System.out.println((if (foundIt) +"Found it" +else +"Didn't find it")) \ No newline at end of file diff --git a/testData/localVariable/statement/object.jav b/testData/localVariable/statement/object.jav new file mode 100644 index 00000000000..c9cd10a31fd --- /dev/null +++ b/testData/localVariable/statement/object.jav @@ -0,0 +1 @@ +int i; \ No newline at end of file diff --git a/testData/localVariable/statement/object.kt b/testData/localVariable/statement/object.kt new file mode 100644 index 00000000000..03ab5111a88 --- /dev/null +++ b/testData/localVariable/statement/object.kt @@ -0,0 +1 @@ +var i : Int \ No newline at end of file diff --git a/testData/methodCallExpression/statement/callWithKeywords.jav b/testData/methodCallExpression/statement/callWithKeywords.jav new file mode 100644 index 00000000000..db350dda8fc --- /dev/null +++ b/testData/methodCallExpression/statement/callWithKeywords.jav @@ -0,0 +1 @@ +when(open, trait); \ No newline at end of file diff --git a/testData/methodCallExpression/statement/callWithKeywords.kt b/testData/methodCallExpression/statement/callWithKeywords.kt new file mode 100644 index 00000000000..92c6a067e95 --- /dev/null +++ b/testData/methodCallExpression/statement/callWithKeywords.kt @@ -0,0 +1 @@ +`when`(`open`, `trait`) \ No newline at end of file diff --git a/testData/methodCallExpression/statement/emptyCall.jav b/testData/methodCallExpression/statement/emptyCall.jav new file mode 100644 index 00000000000..9c6af147cda --- /dev/null +++ b/testData/methodCallExpression/statement/emptyCall.jav @@ -0,0 +1 @@ +methodCall(); \ No newline at end of file diff --git a/testData/methodCallExpression/statement/emptyCall.kt b/testData/methodCallExpression/statement/emptyCall.kt new file mode 100644 index 00000000000..60d495be000 --- /dev/null +++ b/testData/methodCallExpression/statement/emptyCall.kt @@ -0,0 +1 @@ +methodCall() \ No newline at end of file diff --git a/testData/methodCallExpression/statement/simpleCall.jav b/testData/methodCallExpression/statement/simpleCall.jav new file mode 100644 index 00000000000..0e52b457e69 --- /dev/null +++ b/testData/methodCallExpression/statement/simpleCall.jav @@ -0,0 +1 @@ +method(param1, param2); \ No newline at end of file diff --git a/testData/methodCallExpression/statement/simpleCall.kt b/testData/methodCallExpression/statement/simpleCall.kt new file mode 100644 index 00000000000..43ea8339772 --- /dev/null +++ b/testData/methodCallExpression/statement/simpleCall.kt @@ -0,0 +1 @@ +method(param1, param2) \ No newline at end of file diff --git a/testData/newClassExpression/expression/classWithParam.jav b/testData/newClassExpression/expression/classWithParam.jav new file mode 100644 index 00000000000..44849d3495c --- /dev/null +++ b/testData/newClassExpression/expression/classWithParam.jav @@ -0,0 +1 @@ +new Foo(param); \ No newline at end of file diff --git a/testData/newClassExpression/expression/classWithParam.kt b/testData/newClassExpression/expression/classWithParam.kt new file mode 100644 index 00000000000..9d29e159e31 --- /dev/null +++ b/testData/newClassExpression/expression/classWithParam.kt @@ -0,0 +1 @@ +Foo(param) \ No newline at end of file diff --git a/testData/newClassExpression/expression/classWithParams.jav b/testData/newClassExpression/expression/classWithParams.jav new file mode 100644 index 00000000000..2461539a170 --- /dev/null +++ b/testData/newClassExpression/expression/classWithParams.jav @@ -0,0 +1 @@ +new Foo(param1, param2); \ No newline at end of file diff --git a/testData/newClassExpression/expression/classWithParams.kt b/testData/newClassExpression/expression/classWithParams.kt new file mode 100644 index 00000000000..e10fb436db2 --- /dev/null +++ b/testData/newClassExpression/expression/classWithParams.kt @@ -0,0 +1 @@ +Foo(param1, param2) \ No newline at end of file diff --git a/testData/newClassExpression/expression/classWithoutBody.jav b/testData/newClassExpression/expression/classWithoutBody.jav new file mode 100644 index 00000000000..acad3c2ee3f --- /dev/null +++ b/testData/newClassExpression/expression/classWithoutBody.jav @@ -0,0 +1 @@ +new Foo(); \ No newline at end of file diff --git a/testData/newClassExpression/expression/classWithoutBody.kt b/testData/newClassExpression/expression/classWithoutBody.kt new file mode 100644 index 00000000000..17f280dc444 --- /dev/null +++ b/testData/newClassExpression/expression/classWithoutBody.kt @@ -0,0 +1 @@ +Foo() \ No newline at end of file diff --git a/testData/newClassExpression/expression/classWithoutBody2.jav b/testData/newClassExpression/expression/classWithoutBody2.jav new file mode 100644 index 00000000000..6c79694938f --- /dev/null +++ b/testData/newClassExpression/expression/classWithoutBody2.jav @@ -0,0 +1 @@ +new myApp.Foo(); \ No newline at end of file diff --git a/testData/newClassExpression/expression/classWithoutBody2.kt b/testData/newClassExpression/expression/classWithoutBody2.kt new file mode 100644 index 00000000000..4c5fba47bd0 --- /dev/null +++ b/testData/newClassExpression/expression/classWithoutBody2.kt @@ -0,0 +1 @@ +myApp.Foo() \ No newline at end of file diff --git a/testData/outProjectionType/method/methodParams.jav b/testData/outProjectionType/method/methodParams.jav new file mode 100644 index 00000000000..ac87941ea87 --- /dev/null +++ b/testData/outProjectionType/method/methodParams.jav @@ -0,0 +1 @@ +void pushAll(Collection src) {} \ No newline at end of file diff --git a/testData/outProjectionType/method/methodParams.kt b/testData/outProjectionType/method/methodParams.kt new file mode 100644 index 00000000000..6117f1d6945 --- /dev/null +++ b/testData/outProjectionType/method/methodParams.kt @@ -0,0 +1 @@ +fun pushAll(src : Collection?) : Unit { } \ No newline at end of file diff --git a/testData/parenthesizedExpression/expression/parenthesized.jav b/testData/parenthesizedExpression/expression/parenthesized.jav new file mode 100644 index 00000000000..0a911375668 --- /dev/null +++ b/testData/parenthesizedExpression/expression/parenthesized.jav @@ -0,0 +1 @@ +(1 + 2) \ No newline at end of file diff --git a/testData/parenthesizedExpression/expression/parenthesized.kt b/testData/parenthesizedExpression/expression/parenthesized.kt new file mode 100644 index 00000000000..eb8f4ff5a21 --- /dev/null +++ b/testData/parenthesizedExpression/expression/parenthesized.kt @@ -0,0 +1 @@ +((1 + 2)) \ No newline at end of file diff --git a/testData/parenthesizedExpression/expression/parenthesized2.jav b/testData/parenthesizedExpression/expression/parenthesized2.jav new file mode 100644 index 00000000000..390ddb6f123 --- /dev/null +++ b/testData/parenthesizedExpression/expression/parenthesized2.jav @@ -0,0 +1 @@ +(o.toString() + "abc") \ No newline at end of file diff --git a/testData/parenthesizedExpression/expression/parenthesized2.kt b/testData/parenthesizedExpression/expression/parenthesized2.kt new file mode 100644 index 00000000000..53aa2923a2c --- /dev/null +++ b/testData/parenthesizedExpression/expression/parenthesized2.kt @@ -0,0 +1 @@ +((o.toString() + "abc")) \ No newline at end of file diff --git a/testData/polyadicExpression/expression_mult/divide.jav b/testData/polyadicExpression/expression_mult/divide.jav new file mode 100644 index 00000000000..6005ff02b5d --- /dev/null +++ b/testData/polyadicExpression/expression_mult/divide.jav @@ -0,0 +1 @@ +1 / 2 / 3 \ No newline at end of file diff --git a/testData/polyadicExpression/expression_mult/divide.kt b/testData/polyadicExpression/expression_mult/divide.kt new file mode 100644 index 00000000000..8da2777c101 --- /dev/null +++ b/testData/polyadicExpression/expression_mult/divide.kt @@ -0,0 +1 @@ +(1 / 2 / 3) \ No newline at end of file diff --git a/testData/polyadicExpression/expression_mult/minus.jav b/testData/polyadicExpression/expression_mult/minus.jav new file mode 100644 index 00000000000..35002f64d1e --- /dev/null +++ b/testData/polyadicExpression/expression_mult/minus.jav @@ -0,0 +1 @@ +1 - 2 - 3 \ No newline at end of file diff --git a/testData/polyadicExpression/expression_mult/minus.kt b/testData/polyadicExpression/expression_mult/minus.kt new file mode 100644 index 00000000000..220aab2cfa6 --- /dev/null +++ b/testData/polyadicExpression/expression_mult/minus.kt @@ -0,0 +1 @@ +(1 - 2 - 3) \ No newline at end of file diff --git a/testData/polyadicExpression/expression_mult/multiply.jav b/testData/polyadicExpression/expression_mult/multiply.jav new file mode 100644 index 00000000000..89ddea79483 --- /dev/null +++ b/testData/polyadicExpression/expression_mult/multiply.jav @@ -0,0 +1 @@ +1 * 2 * 3 \ No newline at end of file diff --git a/testData/polyadicExpression/expression_mult/multiply.kt b/testData/polyadicExpression/expression_mult/multiply.kt new file mode 100644 index 00000000000..588078fc87e --- /dev/null +++ b/testData/polyadicExpression/expression_mult/multiply.kt @@ -0,0 +1 @@ +(1 * 2 * 3) \ No newline at end of file diff --git a/testData/polyadicExpression/expression_mult/plus.jav b/testData/polyadicExpression/expression_mult/plus.jav new file mode 100644 index 00000000000..8a2a3c5ef6f --- /dev/null +++ b/testData/polyadicExpression/expression_mult/plus.jav @@ -0,0 +1 @@ +1 + 2 + 3 \ No newline at end of file diff --git a/testData/polyadicExpression/expression_mult/plus.kt b/testData/polyadicExpression/expression_mult/plus.kt new file mode 100644 index 00000000000..5dcba15ae9a --- /dev/null +++ b/testData/polyadicExpression/expression_mult/plus.kt @@ -0,0 +1 @@ +(1 + 2 + 3) \ No newline at end of file diff --git a/testData/polyadicExpression/expression_mult/remainder.jav b/testData/polyadicExpression/expression_mult/remainder.jav new file mode 100644 index 00000000000..2e120c0cd68 --- /dev/null +++ b/testData/polyadicExpression/expression_mult/remainder.jav @@ -0,0 +1 @@ +1 % 2 % 3 \ No newline at end of file diff --git a/testData/polyadicExpression/expression_mult/remainder.kt b/testData/polyadicExpression/expression_mult/remainder.kt new file mode 100644 index 00000000000..65b18900b56 --- /dev/null +++ b/testData/polyadicExpression/expression_mult/remainder.kt @@ -0,0 +1 @@ +(1 % 2 % 3) \ No newline at end of file diff --git a/testData/postfixOperator/statement_mult/decrement.jav b/testData/postfixOperator/statement_mult/decrement.jav new file mode 100644 index 00000000000..47b6f21c63d --- /dev/null +++ b/testData/postfixOperator/statement_mult/decrement.jav @@ -0,0 +1 @@ +i--; \ No newline at end of file diff --git a/testData/postfixOperator/statement_mult/decrement.kt b/testData/postfixOperator/statement_mult/decrement.kt new file mode 100644 index 00000000000..1387099f5a4 --- /dev/null +++ b/testData/postfixOperator/statement_mult/decrement.kt @@ -0,0 +1 @@ +(i--) \ No newline at end of file diff --git a/testData/postfixOperator/statement_mult/increment.jav b/testData/postfixOperator/statement_mult/increment.jav new file mode 100644 index 00000000000..689efdaa358 --- /dev/null +++ b/testData/postfixOperator/statement_mult/increment.jav @@ -0,0 +1 @@ +i++; \ No newline at end of file diff --git a/testData/postfixOperator/statement_mult/increment.kt b/testData/postfixOperator/statement_mult/increment.kt new file mode 100644 index 00000000000..568dc98d422 --- /dev/null +++ b/testData/postfixOperator/statement_mult/increment.kt @@ -0,0 +1 @@ +(i++) \ No newline at end of file diff --git a/testData/prefixOperator/statement_mult/decrement.jav b/testData/prefixOperator/statement_mult/decrement.jav new file mode 100644 index 00000000000..10724ba55da --- /dev/null +++ b/testData/prefixOperator/statement_mult/decrement.jav @@ -0,0 +1 @@ +--i; \ No newline at end of file diff --git a/testData/prefixOperator/statement_mult/decrement.kt b/testData/prefixOperator/statement_mult/decrement.kt new file mode 100644 index 00000000000..93712ce027e --- /dev/null +++ b/testData/prefixOperator/statement_mult/decrement.kt @@ -0,0 +1 @@ +(--i) \ No newline at end of file diff --git a/testData/prefixOperator/statement_mult/increment.jav b/testData/prefixOperator/statement_mult/increment.jav new file mode 100644 index 00000000000..97ad097f1e2 --- /dev/null +++ b/testData/prefixOperator/statement_mult/increment.jav @@ -0,0 +1 @@ +++i; \ No newline at end of file diff --git a/testData/prefixOperator/statement_mult/increment.kt b/testData/prefixOperator/statement_mult/increment.kt new file mode 100644 index 00000000000..b981de4d9b3 --- /dev/null +++ b/testData/prefixOperator/statement_mult/increment.kt @@ -0,0 +1 @@ +(++i) \ No newline at end of file diff --git a/testData/returnStatement/statement/returnChar.jav b/testData/returnStatement/statement/returnChar.jav new file mode 100644 index 00000000000..d693916818c --- /dev/null +++ b/testData/returnStatement/statement/returnChar.jav @@ -0,0 +1 @@ +return 'c'; \ No newline at end of file diff --git a/testData/returnStatement/statement/returnChar.kt b/testData/returnStatement/statement/returnChar.kt new file mode 100644 index 00000000000..b6284fba897 --- /dev/null +++ b/testData/returnStatement/statement/returnChar.kt @@ -0,0 +1 @@ +return 'c' \ No newline at end of file diff --git a/testData/returnStatement/statement/returnLiteral.jav b/testData/returnStatement/statement/returnLiteral.jav new file mode 100644 index 00000000000..5acac407ebf --- /dev/null +++ b/testData/returnStatement/statement/returnLiteral.jav @@ -0,0 +1 @@ +return true; \ No newline at end of file diff --git a/testData/returnStatement/statement/returnLiteral.kt b/testData/returnStatement/statement/returnLiteral.kt new file mode 100644 index 00000000000..2a925639120 --- /dev/null +++ b/testData/returnStatement/statement/returnLiteral.kt @@ -0,0 +1 @@ +return true \ No newline at end of file diff --git a/testData/returnStatement/statement/returnNumber.jav b/testData/returnStatement/statement/returnNumber.jav new file mode 100644 index 00000000000..eb224e0951e --- /dev/null +++ b/testData/returnStatement/statement/returnNumber.jav @@ -0,0 +1 @@ +return 1; \ No newline at end of file diff --git a/testData/returnStatement/statement/returnNumber.kt b/testData/returnStatement/statement/returnNumber.kt new file mode 100644 index 00000000000..5efef616fdb --- /dev/null +++ b/testData/returnStatement/statement/returnNumber.kt @@ -0,0 +1 @@ +return 1 \ No newline at end of file diff --git a/testData/returnStatement/statement/returnString.jav b/testData/returnStatement/statement/returnString.jav new file mode 100644 index 00000000000..b98a6ce7734 --- /dev/null +++ b/testData/returnStatement/statement/returnString.jav @@ -0,0 +1 @@ +return "str"; \ No newline at end of file diff --git a/testData/returnStatement/statement/returnString.kt b/testData/returnStatement/statement/returnString.kt new file mode 100644 index 00000000000..f831e0baf83 --- /dev/null +++ b/testData/returnStatement/statement/returnString.kt @@ -0,0 +1 @@ +return "str" \ No newline at end of file diff --git a/testData/starProjectionType/method/methodParams.jav b/testData/starProjectionType/method/methodParams.jav new file mode 100644 index 00000000000..18d4217e0d9 --- /dev/null +++ b/testData/starProjectionType/method/methodParams.jav @@ -0,0 +1 @@ +void wtf(Collection w) {} \ No newline at end of file diff --git a/testData/starProjectionType/method/methodParams.kt b/testData/starProjectionType/method/methodParams.kt new file mode 100644 index 00000000000..2f5330f87b6 --- /dev/null +++ b/testData/starProjectionType/method/methodParams.kt @@ -0,0 +1 @@ +fun wtf(w : Collection<*>?) : Unit { } \ No newline at end of file diff --git a/testData/synchronizedStatement/statement/singleLineExample.jav b/testData/synchronizedStatement/statement/singleLineExample.jav new file mode 100644 index 00000000000..4c4b01beee5 --- /dev/null +++ b/testData/synchronizedStatement/statement/singleLineExample.jav @@ -0,0 +1 @@ +synchronized (s) { doSomething(s); } \ No newline at end of file diff --git a/testData/synchronizedStatement/statement/singleLineExample.kt b/testData/synchronizedStatement/statement/singleLineExample.kt new file mode 100644 index 00000000000..033b39c45cf --- /dev/null +++ b/testData/synchronizedStatement/statement/singleLineExample.kt @@ -0,0 +1 @@ +synchronized (s) { doSomething(s) } \ No newline at end of file diff --git a/testData/throwStatement/statement/simpleThrowStatement.jav b/testData/throwStatement/statement/simpleThrowStatement.jav new file mode 100644 index 00000000000..2d879427e7c --- /dev/null +++ b/testData/throwStatement/statement/simpleThrowStatement.jav @@ -0,0 +1 @@ +throw exception; \ No newline at end of file diff --git a/testData/throwStatement/statement/simpleThrowStatement.kt b/testData/throwStatement/statement/simpleThrowStatement.kt new file mode 100644 index 00000000000..0894cfeda14 --- /dev/null +++ b/testData/throwStatement/statement/simpleThrowStatement.kt @@ -0,0 +1 @@ +throw exception \ No newline at end of file diff --git a/testData/trait/class/emptyInterface.jav b/testData/trait/class/emptyInterface.jav new file mode 100644 index 00000000000..0bdb5912e9b --- /dev/null +++ b/testData/trait/class/emptyInterface.jav @@ -0,0 +1 @@ +interface A {} \ No newline at end of file diff --git a/testData/trait/class/emptyInterface.kt b/testData/trait/class/emptyInterface.kt new file mode 100644 index 00000000000..a2cce28acad --- /dev/null +++ b/testData/trait/class/emptyInterface.kt @@ -0,0 +1 @@ +trait A { } \ No newline at end of file diff --git a/testData/trait/class/extendsOneClassAndImplementsSeveralInterfaces.jav b/testData/trait/class/extendsOneClassAndImplementsSeveralInterfaces.jav new file mode 100644 index 00000000000..f0434f0b324 --- /dev/null +++ b/testData/trait/class/extendsOneClassAndImplementsSeveralInterfaces.jav @@ -0,0 +1 @@ +interface A extends I0, I1, I2 {} \ No newline at end of file diff --git a/testData/trait/class/extendsOneClassAndImplementsSeveralInterfaces.kt b/testData/trait/class/extendsOneClassAndImplementsSeveralInterfaces.kt new file mode 100644 index 00000000000..354dd60f348 --- /dev/null +++ b/testData/trait/class/extendsOneClassAndImplementsSeveralInterfaces.kt @@ -0,0 +1 @@ +trait A : I0, I1, I2 { } \ No newline at end of file diff --git a/testData/trait/class/extendsOneInterface.jav b/testData/trait/class/extendsOneInterface.jav new file mode 100644 index 00000000000..fdd7b33cb4b --- /dev/null +++ b/testData/trait/class/extendsOneInterface.jav @@ -0,0 +1 @@ +interface A extends I {} \ No newline at end of file diff --git a/testData/trait/class/extendsOneInterface.kt b/testData/trait/class/extendsOneInterface.kt new file mode 100644 index 00000000000..1d64da28e8d --- /dev/null +++ b/testData/trait/class/extendsOneInterface.kt @@ -0,0 +1 @@ +trait A : I { } \ No newline at end of file diff --git a/testData/trait/class/internalInterface.jav b/testData/trait/class/internalInterface.jav new file mode 100644 index 00000000000..6afccc2f169 --- /dev/null +++ b/testData/trait/class/internalInterface.jav @@ -0,0 +1 @@ +interface Test {} \ No newline at end of file diff --git a/testData/trait/class/internalInterface.kt b/testData/trait/class/internalInterface.kt new file mode 100644 index 00000000000..1a34b23ead0 --- /dev/null +++ b/testData/trait/class/internalInterface.kt @@ -0,0 +1 @@ +trait Test { } \ No newline at end of file diff --git a/testData/trait/class/privateInterface.jav b/testData/trait/class/privateInterface.jav new file mode 100644 index 00000000000..cf33d97c99c --- /dev/null +++ b/testData/trait/class/privateInterface.jav @@ -0,0 +1 @@ +private interface Test {} \ No newline at end of file diff --git a/testData/trait/class/privateInterface.kt b/testData/trait/class/privateInterface.kt new file mode 100644 index 00000000000..40dd81f4759 --- /dev/null +++ b/testData/trait/class/privateInterface.kt @@ -0,0 +1 @@ +private trait Test { } \ No newline at end of file diff --git a/testData/trait/class/protectedInterface.jav b/testData/trait/class/protectedInterface.jav new file mode 100644 index 00000000000..e91d5694021 --- /dev/null +++ b/testData/trait/class/protectedInterface.jav @@ -0,0 +1 @@ +protected interface Test {} \ No newline at end of file diff --git a/testData/trait/class/protectedInterface.kt b/testData/trait/class/protectedInterface.kt new file mode 100644 index 00000000000..16e306a9859 --- /dev/null +++ b/testData/trait/class/protectedInterface.kt @@ -0,0 +1 @@ +protected trait Test { } \ No newline at end of file diff --git a/testData/trait/class/publicInterface.jav b/testData/trait/class/publicInterface.jav new file mode 100644 index 00000000000..19c4ff3a675 --- /dev/null +++ b/testData/trait/class/publicInterface.jav @@ -0,0 +1 @@ +public interface Test {} \ No newline at end of file diff --git a/testData/trait/class/publicInterface.kt b/testData/trait/class/publicInterface.kt new file mode 100644 index 00000000000..3c2f3d72209 --- /dev/null +++ b/testData/trait/class/publicInterface.kt @@ -0,0 +1 @@ +public trait Test { } \ No newline at end of file diff --git a/testData/trait/class_mult/interfaceWithFields.jav b/testData/trait/class_mult/interfaceWithFields.jav new file mode 100644 index 00000000000..5fdf82bfa6c --- /dev/null +++ b/testData/trait/class_mult/interfaceWithFields.jav @@ -0,0 +1 @@ +interface INode {String IN = "in";String AT = "@";String COMMA_WITH_SPACE = COMMA + SPACE;} \ No newline at end of file diff --git a/testData/trait/class_mult/interfaceWithFields.kt b/testData/trait/class_mult/interfaceWithFields.kt new file mode 100644 index 00000000000..fc2ab5e9a4f --- /dev/null +++ b/testData/trait/class_mult/interfaceWithFields.kt @@ -0,0 +1,7 @@ +trait INode { +class object { +public val IN : String? = "in" +public val AT : String? = "@" +public val COMMA_WITH_SPACE : String? = (COMMA + SPACE) +} +} \ No newline at end of file diff --git a/testData/trait/class_mult/interfaceWithMethodDeclaration.jav b/testData/trait/class_mult/interfaceWithMethodDeclaration.jav new file mode 100644 index 00000000000..4023476a76e --- /dev/null +++ b/testData/trait/class_mult/interfaceWithMethodDeclaration.jav @@ -0,0 +1 @@ +interface INode {Tag getTag();String toKotlin();} \ No newline at end of file diff --git a/testData/trait/class_mult/interfaceWithMethodDeclaration.kt b/testData/trait/class_mult/interfaceWithMethodDeclaration.kt new file mode 100644 index 00000000000..bf3ade94a28 --- /dev/null +++ b/testData/trait/class_mult/interfaceWithMethodDeclaration.kt @@ -0,0 +1,4 @@ +trait INode { +public fun getTag() : Tag? +public fun toKotlin() : String? +} \ No newline at end of file diff --git a/testData/trait/class_mult/interfaceWithStaticFields.jav b/testData/trait/class_mult/interfaceWithStaticFields.jav new file mode 100644 index 00000000000..831ea008a23 --- /dev/null +++ b/testData/trait/class_mult/interfaceWithStaticFields.jav @@ -0,0 +1 @@ +public interface INode { public static final String IN = "in"; public static final String AT = "@"; public static final String COMMA_WITH_SPACE = COMMA + SPACE;} \ No newline at end of file diff --git a/testData/trait/class_mult/interfaceWithStaticFields.kt b/testData/trait/class_mult/interfaceWithStaticFields.kt new file mode 100644 index 00000000000..22d47bf9a91 --- /dev/null +++ b/testData/trait/class_mult/interfaceWithStaticFields.kt @@ -0,0 +1,7 @@ +public trait INode { +class object { +public val IN : String? = "in" +public val AT : String? = "@" +public val COMMA_WITH_SPACE : String? = (COMMA + SPACE) +} +} \ No newline at end of file diff --git a/testData/tryStatement/statement_mult/commonCaseForTryStatement.jav b/testData/tryStatement/statement_mult/commonCaseForTryStatement.jav new file mode 100644 index 00000000000..ba4d634d21b --- /dev/null +++ b/testData/tryStatement/statement_mult/commonCaseForTryStatement.jav @@ -0,0 +1 @@ +try { callMethod(params);} catch (Exception e) { println(1);} catch (IOException e) { println(0);} finally { println(3);} \ No newline at end of file diff --git a/testData/tryStatement/statement_mult/commonCaseForTryStatement.kt b/testData/tryStatement/statement_mult/commonCaseForTryStatement.kt new file mode 100644 index 00000000000..8ff1a9a7da8 --- /dev/null +++ b/testData/tryStatement/statement_mult/commonCaseForTryStatement.kt @@ -0,0 +1,14 @@ +try +{ +callMethod(params) +} +catch (e : Exception?) { +println(1) +} +catch (e : IOException?) { +println(0) +} +finally +{ +println(3) +} \ No newline at end of file diff --git a/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithEmptyFinally.jav b/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithEmptyFinally.jav new file mode 100644 index 00000000000..f334b56c36a --- /dev/null +++ b/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithEmptyFinally.jav @@ -0,0 +1 @@ +try {} catch (Exception e) { println(1);} catch (IOException e) { println(0);} finally {} \ No newline at end of file diff --git a/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithEmptyFinally.kt b/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithEmptyFinally.kt new file mode 100644 index 00000000000..cb84316d7a2 --- /dev/null +++ b/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithEmptyFinally.kt @@ -0,0 +1,12 @@ +try +{ +} +catch (e : Exception?) { +println(1) +} +catch (e : IOException?) { +println(0) +} +finally +{ +} \ No newline at end of file diff --git a/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithFinally.jav b/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithFinally.jav new file mode 100644 index 00000000000..9658c4120c2 --- /dev/null +++ b/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithFinally.jav @@ -0,0 +1 @@ +try {} catch (Exception e) { println(1);} catch (IOException e) { println(0);} finally { println(3);} \ No newline at end of file diff --git a/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithFinally.kt b/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithFinally.kt new file mode 100644 index 00000000000..9cef76b4596 --- /dev/null +++ b/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithFinally.kt @@ -0,0 +1,13 @@ +try +{ +} +catch (e : Exception?) { +println(1) +} +catch (e : IOException?) { +println(0) +} +finally +{ +println(3) +} \ No newline at end of file diff --git a/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithoutFinally.jav b/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithoutFinally.jav new file mode 100644 index 00000000000..5e85a85b378 --- /dev/null +++ b/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithoutFinally.jav @@ -0,0 +1 @@ +try {} catch (Exception e) { println(1);} catch (IOException e) { println(0);} \ No newline at end of file diff --git a/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithoutFinally.kt b/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithoutFinally.kt new file mode 100644 index 00000000000..47bd997f98a --- /dev/null +++ b/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithoutFinally.kt @@ -0,0 +1,9 @@ +try +{ +} +catch (e : Exception?) { +println(1) +} +catch (e : IOException?) { +println(0) +} \ No newline at end of file diff --git a/testData/typeCastExpression/expression_mult/extendsWildcardCast.jav b/testData/typeCastExpression/expression_mult/extendsWildcardCast.jav new file mode 100644 index 00000000000..c19f94da6e8 --- /dev/null +++ b/testData/typeCastExpression/expression_mult/extendsWildcardCast.jav @@ -0,0 +1 @@ +(List)list \ No newline at end of file diff --git a/testData/typeCastExpression/expression_mult/extendsWildcardCast.kt b/testData/typeCastExpression/expression_mult/extendsWildcardCast.kt new file mode 100644 index 00000000000..05db17e423f --- /dev/null +++ b/testData/typeCastExpression/expression_mult/extendsWildcardCast.kt @@ -0,0 +1 @@ +(list as List?) \ No newline at end of file diff --git a/testData/typeCastExpression/expression_mult/fooCast.jav b/testData/typeCastExpression/expression_mult/fooCast.jav new file mode 100644 index 00000000000..8edd243486a --- /dev/null +++ b/testData/typeCastExpression/expression_mult/fooCast.jav @@ -0,0 +1 @@ +(Foo)t \ No newline at end of file diff --git a/testData/typeCastExpression/expression_mult/fooCast.kt b/testData/typeCastExpression/expression_mult/fooCast.kt new file mode 100644 index 00000000000..109689e1240 --- /dev/null +++ b/testData/typeCastExpression/expression_mult/fooCast.kt @@ -0,0 +1 @@ +(t as Foo?) \ No newline at end of file diff --git a/testData/typeCastExpression/expression_mult/intCast.jav b/testData/typeCastExpression/expression_mult/intCast.jav new file mode 100644 index 00000000000..c000fb4d468 --- /dev/null +++ b/testData/typeCastExpression/expression_mult/intCast.jav @@ -0,0 +1 @@ +(int)t \ No newline at end of file diff --git a/testData/typeCastExpression/expression_mult/intCast.kt b/testData/typeCastExpression/expression_mult/intCast.kt new file mode 100644 index 00000000000..28dc4fc3816 --- /dev/null +++ b/testData/typeCastExpression/expression_mult/intCast.kt @@ -0,0 +1 @@ +(t as Int) \ No newline at end of file diff --git a/testData/typeCastExpression/expression_mult/primitiveType.jav b/testData/typeCastExpression/expression_mult/primitiveType.jav new file mode 100644 index 00000000000..a9cc54cd6b8 --- /dev/null +++ b/testData/typeCastExpression/expression_mult/primitiveType.jav @@ -0,0 +1 @@ +(int)100.00; \ No newline at end of file diff --git a/testData/typeCastExpression/expression_mult/primitiveType.kt b/testData/typeCastExpression/expression_mult/primitiveType.kt new file mode 100644 index 00000000000..ad9dd5d2a7b --- /dev/null +++ b/testData/typeCastExpression/expression_mult/primitiveType.kt @@ -0,0 +1 @@ +(100.00 as Int) \ No newline at end of file diff --git a/testData/typeCastExpression/expression_mult/simpleGenericCast.jav b/testData/typeCastExpression/expression_mult/simpleGenericCast.jav new file mode 100644 index 00000000000..cdfdd30aea4 --- /dev/null +++ b/testData/typeCastExpression/expression_mult/simpleGenericCast.jav @@ -0,0 +1 @@ +(List)list \ No newline at end of file diff --git a/testData/typeCastExpression/expression_mult/simpleGenericCast.kt b/testData/typeCastExpression/expression_mult/simpleGenericCast.kt new file mode 100644 index 00000000000..c48c5d7637d --- /dev/null +++ b/testData/typeCastExpression/expression_mult/simpleGenericCast.kt @@ -0,0 +1 @@ +(list as List?) \ No newline at end of file diff --git a/testData/typeCastExpression/expression_mult/stringCast.jav b/testData/typeCastExpression/expression_mult/stringCast.jav new file mode 100644 index 00000000000..b4cf91cf340 --- /dev/null +++ b/testData/typeCastExpression/expression_mult/stringCast.jav @@ -0,0 +1 @@ +(String)t \ No newline at end of file diff --git a/testData/typeCastExpression/expression_mult/stringCast.kt b/testData/typeCastExpression/expression_mult/stringCast.kt new file mode 100644 index 00000000000..a2020f03831 --- /dev/null +++ b/testData/typeCastExpression/expression_mult/stringCast.kt @@ -0,0 +1 @@ +(t as String?) \ No newline at end of file diff --git a/testData/typeCastExpression/expression_mult/superWildcardCast.jav b/testData/typeCastExpression/expression_mult/superWildcardCast.jav new file mode 100644 index 00000000000..c197fc42e15 --- /dev/null +++ b/testData/typeCastExpression/expression_mult/superWildcardCast.jav @@ -0,0 +1 @@ +(List)list \ No newline at end of file diff --git a/testData/typeCastExpression/expression_mult/superWildcardCast.kt b/testData/typeCastExpression/expression_mult/superWildcardCast.kt new file mode 100644 index 00000000000..1bc5cd16259 --- /dev/null +++ b/testData/typeCastExpression/expression_mult/superWildcardCast.kt @@ -0,0 +1 @@ +(list as List?) \ No newline at end of file diff --git a/testData/typeCastExpression/expression_mult/wildcardCast.jav b/testData/typeCastExpression/expression_mult/wildcardCast.jav new file mode 100644 index 00000000000..38bd7a07f97 --- /dev/null +++ b/testData/typeCastExpression/expression_mult/wildcardCast.jav @@ -0,0 +1 @@ +(List)list \ No newline at end of file diff --git a/testData/typeCastExpression/expression_mult/wildcardCast.kt b/testData/typeCastExpression/expression_mult/wildcardCast.kt new file mode 100644 index 00000000000..47484fba27b --- /dev/null +++ b/testData/typeCastExpression/expression_mult/wildcardCast.kt @@ -0,0 +1 @@ +(list as List<*>?) \ No newline at end of file diff --git a/testData/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.jav b/testData/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.jav new file mode 100644 index 00000000000..c576f7f0633 --- /dev/null +++ b/testData/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.jav @@ -0,0 +1 @@ +final class CC , K extends Node & Collection> extends A {} \ No newline at end of file diff --git a/testData/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.kt b/testData/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.kt new file mode 100644 index 00000000000..4177d8f1720 --- /dev/null +++ b/testData/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.kt @@ -0,0 +1 @@ +class CC : A where T : Comparable?, K : Collection? { } \ No newline at end of file diff --git a/testData/typeParameters/class/classParametrizationWithTwoBounds.jav b/testData/typeParameters/class/classParametrizationWithTwoBounds.jav new file mode 100644 index 00000000000..9794cb4338c --- /dev/null +++ b/testData/typeParameters/class/classParametrizationWithTwoBounds.jav @@ -0,0 +1 @@ +final class C> {} \ No newline at end of file diff --git a/testData/typeParameters/class/classParametrizationWithTwoBounds.kt b/testData/typeParameters/class/classParametrizationWithTwoBounds.kt new file mode 100644 index 00000000000..16234cc8e44 --- /dev/null +++ b/testData/typeParameters/class/classParametrizationWithTwoBounds.kt @@ -0,0 +1 @@ +class C where T : Comparable? { } \ No newline at end of file diff --git a/testData/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.jav b/testData/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.jav new file mode 100644 index 00000000000..aaea17bff62 --- /dev/null +++ b/testData/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.jav @@ -0,0 +1 @@ +final class C> extends A {} \ No newline at end of file diff --git a/testData/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.kt b/testData/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.kt new file mode 100644 index 00000000000..a22d76df018 --- /dev/null +++ b/testData/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.kt @@ -0,0 +1 @@ +class C : A where T : Comparable? { } \ No newline at end of file diff --git a/testData/typeParameters/class/complexExampleWithClassExtending.jav b/testData/typeParameters/class/complexExampleWithClassExtending.jav new file mode 100644 index 00000000000..d23995b68a2 --- /dev/null +++ b/testData/typeParameters/class/complexExampleWithClassExtending.jav @@ -0,0 +1 @@ +interface CommandHandler {} \ No newline at end of file diff --git a/testData/typeParameters/class/complexExampleWithClassExtending.kt b/testData/typeParameters/class/complexExampleWithClassExtending.kt new file mode 100644 index 00000000000..c915d092f82 --- /dev/null +++ b/testData/typeParameters/class/complexExampleWithClassExtending.kt @@ -0,0 +1 @@ +trait CommandHandler { } \ No newline at end of file diff --git a/testData/typeParameters/class/complexExampleWithClassMultiplyExtending.jav b/testData/typeParameters/class/complexExampleWithClassMultiplyExtending.jav new file mode 100644 index 00000000000..8d1c87481ff --- /dev/null +++ b/testData/typeParameters/class/complexExampleWithClassMultiplyExtending.jav @@ -0,0 +1 @@ +interface CommandHandler {} \ No newline at end of file diff --git a/testData/typeParameters/class/complexExampleWithClassMultiplyExtending.kt b/testData/typeParameters/class/complexExampleWithClassMultiplyExtending.kt new file mode 100644 index 00000000000..9b684ed9022 --- /dev/null +++ b/testData/typeParameters/class/complexExampleWithClassMultiplyExtending.kt @@ -0,0 +1 @@ +trait CommandHandler { } \ No newline at end of file diff --git a/testData/typeParameters/class/genericClass.jav b/testData/typeParameters/class/genericClass.jav new file mode 100644 index 00000000000..10066e3b55d --- /dev/null +++ b/testData/typeParameters/class/genericClass.jav @@ -0,0 +1 @@ +final class Comparable {} \ No newline at end of file diff --git a/testData/typeParameters/class/genericClass.kt b/testData/typeParameters/class/genericClass.kt new file mode 100644 index 00000000000..eba6f27b2bf --- /dev/null +++ b/testData/typeParameters/class/genericClass.kt @@ -0,0 +1 @@ +class Comparable { } \ No newline at end of file diff --git a/testData/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.jav b/testData/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.jav new file mode 100644 index 00000000000..533a138632d --- /dev/null +++ b/testData/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.jav @@ -0,0 +1 @@ +interface I , K extends Node & Collection> extends II {} \ No newline at end of file diff --git a/testData/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.kt b/testData/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.kt new file mode 100644 index 00000000000..27a4ec88adc --- /dev/null +++ b/testData/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.kt @@ -0,0 +1 @@ +trait I : II where T : Comparable?, K : Collection? { } \ No newline at end of file diff --git a/testData/typeParameters/method/methodDoubleParametrizationWithTwoBounds.jav b/testData/typeParameters/method/methodDoubleParametrizationWithTwoBounds.jav new file mode 100644 index 00000000000..40ab13a5851 --- /dev/null +++ b/testData/typeParameters/method/methodDoubleParametrizationWithTwoBounds.jav @@ -0,0 +1 @@ +, K extends Node & Collection> T max(Collection coll) {} \ No newline at end of file diff --git a/testData/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt b/testData/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt new file mode 100644 index 00000000000..1e9e0b36ed5 --- /dev/null +++ b/testData/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt @@ -0,0 +1 @@ +fun max(coll : Collection?) : T? where T : Comparable?, K : Collection? { } \ No newline at end of file diff --git a/testData/typeParameters/method/where.jav b/testData/typeParameters/method/where.jav new file mode 100644 index 00000000000..20bb1bf62fd --- /dev/null +++ b/testData/typeParameters/method/where.jav @@ -0,0 +1 @@ +> T max(Collection coll) {} \ No newline at end of file diff --git a/testData/typeParameters/method/where.kt b/testData/typeParameters/method/where.kt new file mode 100644 index 00000000000..fed3c38569d --- /dev/null +++ b/testData/typeParameters/method/where.kt @@ -0,0 +1 @@ +fun max(coll : Collection?) : T? where T : Comparable? { } \ No newline at end of file diff --git a/testData/typeParameters/statement_mult/genericParam.jav b/testData/typeParameters/statement_mult/genericParam.jav new file mode 100644 index 00000000000..89c94caafda --- /dev/null +++ b/testData/typeParameters/statement_mult/genericParam.jav @@ -0,0 +1 @@ +List l; \ No newline at end of file diff --git a/testData/typeParameters/statement_mult/genericParam.kt b/testData/typeParameters/statement_mult/genericParam.kt new file mode 100644 index 00000000000..53f9c91dba7 --- /dev/null +++ b/testData/typeParameters/statement_mult/genericParam.kt @@ -0,0 +1 @@ +var l : List? \ No newline at end of file diff --git a/testData/typeParameters/statement_mult/manyGenericParams.jav b/testData/typeParameters/statement_mult/manyGenericParams.jav new file mode 100644 index 00000000000..65eb2f4ca9d --- /dev/null +++ b/testData/typeParameters/statement_mult/manyGenericParams.jav @@ -0,0 +1 @@ +List l; \ No newline at end of file diff --git a/testData/typeParameters/statement_mult/manyGenericParams.kt b/testData/typeParameters/statement_mult/manyGenericParams.kt new file mode 100644 index 00000000000..007056e4c03 --- /dev/null +++ b/testData/typeParameters/statement_mult/manyGenericParams.kt @@ -0,0 +1 @@ +var l : List? \ No newline at end of file diff --git a/testData/varArg/method/ellipsisTypeSeveralParams.jav b/testData/varArg/method/ellipsisTypeSeveralParams.jav new file mode 100644 index 00000000000..46bdd2765ee --- /dev/null +++ b/testData/varArg/method/ellipsisTypeSeveralParams.jav @@ -0,0 +1 @@ +String format(String pattern, Object... arguments); \ No newline at end of file diff --git a/testData/varArg/method/ellipsisTypeSeveralParams.kt b/testData/varArg/method/ellipsisTypeSeveralParams.kt new file mode 100644 index 00000000000..78207eee74b --- /dev/null +++ b/testData/varArg/method/ellipsisTypeSeveralParams.kt @@ -0,0 +1 @@ +fun format(pattern : String?, vararg arguments : Any?) : String? \ No newline at end of file diff --git a/testData/varArg/method/ellipsisTypeSingleParams.jav b/testData/varArg/method/ellipsisTypeSingleParams.jav new file mode 100644 index 00000000000..2c1f529675e --- /dev/null +++ b/testData/varArg/method/ellipsisTypeSingleParams.jav @@ -0,0 +1 @@ +void pushAll(Object... objs) {} \ No newline at end of file diff --git a/testData/varArg/method/ellipsisTypeSingleParams.kt b/testData/varArg/method/ellipsisTypeSingleParams.kt new file mode 100644 index 00000000000..0456fca4c8f --- /dev/null +++ b/testData/varArg/method/ellipsisTypeSingleParams.kt @@ -0,0 +1 @@ +fun pushAll(vararg objs : Any?) : Unit { } \ No newline at end of file diff --git a/testData/whileStatement/statement_mult/whileWithBlock.jav b/testData/whileStatement/statement_mult/whileWithBlock.jav new file mode 100644 index 00000000000..729a9e5f6f7 --- /dev/null +++ b/testData/whileStatement/statement_mult/whileWithBlock.jav @@ -0,0 +1 @@ +while (a > b) {int i = 1; i = i + 1;} \ No newline at end of file diff --git a/testData/whileStatement/statement_mult/whileWithBlock.kt b/testData/whileStatement/statement_mult/whileWithBlock.kt new file mode 100644 index 00000000000..fa368e489ee --- /dev/null +++ b/testData/whileStatement/statement_mult/whileWithBlock.kt @@ -0,0 +1,5 @@ +while ((a > b)) +{ +var i : Int = 1 +i = (i + 1) +} \ No newline at end of file diff --git a/testData/whileStatement/statement_mult/whileWithEmptyBlock.jav b/testData/whileStatement/statement_mult/whileWithEmptyBlock.jav new file mode 100644 index 00000000000..5055fb08ee2 --- /dev/null +++ b/testData/whileStatement/statement_mult/whileWithEmptyBlock.jav @@ -0,0 +1 @@ +while (true) {} \ No newline at end of file diff --git a/testData/whileStatement/statement_mult/whileWithEmptyBlock.kt b/testData/whileStatement/statement_mult/whileWithEmptyBlock.kt new file mode 100644 index 00000000000..7c69899ce77 --- /dev/null +++ b/testData/whileStatement/statement_mult/whileWithEmptyBlock.kt @@ -0,0 +1,3 @@ +while (true) +{ +} \ No newline at end of file diff --git a/testData/whileStatement/statement_mult/whileWithExpression.jav b/testData/whileStatement/statement_mult/whileWithExpression.jav new file mode 100644 index 00000000000..b0e6f1b9b32 --- /dev/null +++ b/testData/whileStatement/statement_mult/whileWithExpression.jav @@ -0,0 +1 @@ +while (true) i = i + 1; \ No newline at end of file diff --git a/testData/whileStatement/statement_mult/whileWithExpression.kt b/testData/whileStatement/statement_mult/whileWithExpression.kt new file mode 100644 index 00000000000..af7baeada37 --- /dev/null +++ b/testData/whileStatement/statement_mult/whileWithExpression.kt @@ -0,0 +1,2 @@ +while (true) +i = (i + 1) \ No newline at end of file diff --git a/testData/whileStatement/statement_mult/whileWithReturn.jav b/testData/whileStatement/statement_mult/whileWithReturn.jav new file mode 100644 index 00000000000..2174fc827bd --- /dev/null +++ b/testData/whileStatement/statement_mult/whileWithReturn.jav @@ -0,0 +1 @@ +while (true) return 1; \ No newline at end of file diff --git a/testData/whileStatement/statement_mult/whileWithReturn.kt b/testData/whileStatement/statement_mult/whileWithReturn.kt new file mode 100644 index 00000000000..ec1e88ceed8 --- /dev/null +++ b/testData/whileStatement/statement_mult/whileWithReturn.kt @@ -0,0 +1,2 @@ +while (true) +return 1 \ No newline at end of file