From 41a416da60636107ae6f25f8a83a3706b21128ce Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 25 Jan 2013 16:13:45 +0400 Subject: [PATCH] Move blackBoxFile() testData to box/ directory Delete all test methods (and empty test classes), since they'll be auto-generated --- .../arrays/arrayGetAssignMultiIndex.kt | 0 .../{ => box}/arrays/arrayGetMultiIndex.kt | 2 +- .../{ => box}/arrays/arrayPlusAssign.kt | 0 .../arrays/collectionAssignGetMultiIndex.kt | 0 .../arrays/collectionGetMultiIndex.kt | 0 .../{ => box}/arrays/forEachBooleanArray.kt | 0 .../{ => box}/arrays/forEachByteArray.kt | 0 .../{ => box}/arrays/forEachCharArray.kt | 0 .../{ => box}/arrays/forEachDoubleArray.kt | 0 .../{ => box}/arrays/forEachFloatArray.kt | 0 .../{ => box}/arrays/forEachIntArray.kt | 0 .../{ => box}/arrays/forEachLongArray.kt | 0 .../{ => box}/arrays/forEachShortArray.kt | 0 .../codegen/{ => box}/arrays/hashMap.kt | 0 .../codegen/{ => box}/arrays/indices.kt | 0 .../codegen/{ => box}/arrays/indicesChar.kt | 0 .../codegen/{ => box}/arrays/iterator.kt | 0 .../{ => box}/arrays/iteratorBooleanArray.kt | 0 .../{ => box}/arrays/iteratorByteArray.kt | 0 .../arrays/iteratorByteArrayNextByte.kt | 0 .../{ => box}/arrays/iteratorCharArray.kt | 0 .../{ => box}/arrays/iteratorDoubleArray.kt | 0 .../{ => box}/arrays/iteratorFloatArray.kt | 0 .../{ => box}/arrays/iteratorIntArray.kt | 0 .../{ => box}/arrays/iteratorLongArray.kt | 0 .../arrays/iteratorLongArrayNextLong.kt | 0 .../{ => box}/arrays/iteratorShortArray.kt | 0 .../{regressions => box/arrays}/kt238.kt | 2 +- .../{regressions => box/arrays}/kt2997.kt | 0 .../{regressions => box/arrays}/kt33.kt | 2 +- .../{regressions => box/arrays}/kt503.kt | 2 +- .../{regressions => box/arrays}/kt594.kt | 2 +- .../{regressions => box/arrays}/kt602.kt | 0 compiler/testData/codegen/box/arrays/kt779.kt | 3 + .../{regressions => box/arrays}/kt950.kt | 0 .../codegen/{ => box}/arrays/longAsIndex.kt | 0 .../codegen/{ => box}/arrays/nonNullArray.kt | 0 .../codegen/{ => box}/bridges/delegation.kt | 0 .../{ => box}/bridges/delegationProperty.kt | 0 .../bridges/delegationToTraitImpl.kt | 0 .../codegen/{ => box}/bridges/diamond.kt | 0 .../{regressions => box/bridges}/kt1939.kt | 0 .../{regressions => box/bridges}/kt1959.kt | 0 .../{regressions => box/bridges}/kt2498.kt | 0 .../{regressions => box/bridges}/kt2702.kt | 0 .../{regressions => box/bridges}/kt2833.kt | 0 .../{regressions => box/bridges}/kt2920.kt | 0 .../{ => box}/bridges/longChainOneBridge.kt | 0 ...anyTypeArgumentsSubstitutedSuccessively.kt | 0 .../{ => box}/bridges/methodFromTrait.kt | 0 .../bridges/overrideAbstractProperty.kt | 0 .../{ => box}/bridges/overrideReturnType.kt | 2 +- .../bridges/propertyAccessorsWithoutBody.kt | 0 .../{ => box}/bridges/propertyDiamond.kt | 0 .../bridges/propertyInConstructor.kt | 0 .../{ => box}/bridges/propertySetter.kt | 0 .../codegen/{ => box}/bridges/simple.kt | 0 .../codegen/{ => box}/bridges/simpleEnum.kt | 0 .../{ => box}/bridges/simpleGenericMethod.kt | 0 .../codegen/{ => box}/bridges/simpleObject.kt | 0 .../{ => box}/bridges/simpleReturnType.kt | 0 .../{ => box}/bridges/simpleUpperBound.kt | 0 .../bridges/substitutionInSuperClass.kt | 0 .../substitutionInSuperClassAbstractFun.kt | 0 ...itutionInSuperClassBoundedTypeArguments.kt | 0 .../substitutionInSuperClassDelegation.kt | 0 .../bridges/substitutionInSuperClassEnum.kt | 0 .../substitutionInSuperClassGenericMethod.kt | 0 .../bridges/substitutionInSuperClassObject.kt | 0 .../substitutionInSuperClassProperty.kt | 0 .../substitutionInSuperClassUpperBound.kt | 0 ...woParentsWithDifferentMethodsTwoBridges.kt | 0 .../twoParentsWithTheSameMethodOneBridge.kt | 0 .../codegen/{ => box}/classes/classObject.kt | 0 .../{ => box}/classes/classObjectField.kt | 0 .../{ => box}/classes/classObjectInTrait.kt | 0 .../codegen/{ => box}/classes/delegation2.kt | 2 +- .../codegen/{ => box}/classes/delegation3.kt | 0 .../codegen/{ => box}/classes/delegation4.kt | 2 +- .../{ => box}/classes/delegationGenericArg.kt | 0 .../classes/delegationGenericArgUpperBound.kt | 0 .../classes/delegationGenericLongArg.kt | 0 .../{ => box}/classes/delegationJava.kt | 0 .../classes/delegationMethodsWithArgs.kt | 2 +- .../{ => box}/classes/diamondInheritance.kt | 2 +- .../{ => box}/classes/exceptionConstructor.kt | 0 .../{ => box}/classes/funDelegation.kt | 2 +- .../codegen/{ => box}/classes/inheritance.kt | 2 +- .../{ => box}/classes/inheritedInnerClass.kt | 0 .../{ => box}/classes/inheritedMethod.kt | 0 .../{ => box}/classes/initializerBlock.kt | 0 .../classes/initializerBlockDImpl.kt | 0 .../codegen/{ => box}/classes/innerClass.kt | 0 .../{regressions => box/classes}/kt1018.kt | 2 +- .../{regressions => box/classes}/kt1120.kt | 0 .../{regressions => box/classes}/kt1134.kt | 2 +- .../{regressions => box/classes}/kt1157.kt | 2 +- .../{regressions => box/classes}/kt1247.kt | 0 .../{regressions => box/classes}/kt1345.kt | 2 +- .../{regressions => box/classes}/kt1439.kt | 0 .../{regressions => box/classes}/kt1535.kt | 0 .../{regressions => box/classes}/kt1538.kt | 2 +- .../{regressions => box/classes}/kt1578.kt | 0 .../{regressions => box/classes}/kt1611.kt | 2 +- .../{regressions => box/classes}/kt1721.kt | 0 .../{regressions => box/classes}/kt1726.kt | 0 .../{regressions => box/classes}/kt1759.kt | 2 +- .../{regressions => box/classes}/kt1891.kt | 0 .../{regressions => box/classes}/kt1918.kt | 0 .../{regressions => box/classes}/kt1976.kt | 0 .../{regressions => box/classes}/kt1980.kt | 0 .../{regressions => box/classes}/kt2224.kt | 0 .../{regressions => box/classes}/kt2288.kt | 2 +- .../{regressions => box/classes}/kt2384.kt | 0 .../{regressions => box/classes}/kt2390.kt | 0 .../{regressions => box/classes}/kt2391.kt | 0 .../{regressions => box/classes}/kt2395.kt | 0 .../{regressions => box/classes}/kt2417.kt | 2 +- .../{regressions => box/classes}/kt2477.kt | 2 +- .../{regressions => box/classes}/kt2480.kt | 2 +- .../{regressions => box/classes}/kt2482.kt | 2 +- .../{regressions => box/classes}/kt2485.kt | 2 +- .../{regressions => box/classes}/kt249.kt | 0 .../codegen/{ => box}/classes/kt2532.kt | 2 +- .../{regressions => box/classes}/kt2566.kt | 2 +- .../{regressions => box/classes}/kt2566_2.kt | 2 +- .../{regressions => box/classes}/kt2607.kt | 2 +- .../{regressions => box/classes}/kt2626.kt | 2 +- .../{regressions => box/classes}/kt2711.kt | 0 .../{regressions => box/classes}/kt285.kt | 0 .../{regressions => box/classes}/kt343.kt | 2 +- .../{regressions => box/classes}/kt454.kt | 2 +- .../{regressions => box/classes}/kt471.kt | 0 .../{regressions => box/classes}/kt48.kt | 2 +- .../{regressions => box/classes}/kt496.kt | 0 .../{regressions => box/classes}/kt500.kt | 0 .../{regressions => box/classes}/kt501.kt | 0 .../{regressions => box/classes}/kt504.kt | 0 .../{regressions => box/classes}/kt508.kt | 0 .../{regressions => box/classes}/kt633.kt | 2 +- .../{regressions => box/classes}/kt707.kt | 2 +- .../{regressions => box/classes}/kt723.kt | 2 +- .../{regressions => box/classes}/kt725.kt | 2 +- .../{regressions => box/classes}/kt903.kt | 2 +- .../{regressions => box/classes}/kt940.kt | 0 .../codegen/{ => box}/classes/outerThis.kt | 0 .../classes/overloadBinaryOperator.kt | 0 .../{ => box}/classes/overloadPlusAssign.kt | 0 .../classes/overloadPlusAssignReturn.kt | 0 .../classes/overloadPlusToPlusAssign.kt | 0 .../classes/overloadUnaryOperator.kt | 0 .../classes/privateOuterFunctions.kt | 2 +- .../{ => box}/classes/privateOuterProperty.kt | 2 +- .../{ => box}/classes/propertyDelegation.kt | 2 +- .../classes/propertyInInitializer.kt | 0 .../codegen/{ => box}/classes/resolveOrder.kt | 0 .../{ => box}/classes/rightHandOverride.kt | 2 +- .../codegen/{ => box}/classes/selfcreate.kt | 2 +- .../codegen/{ => box}/classes/simpleBox.kt | 0 .../{ => box}/classes/typedDelegation.kt | 2 +- .../closures}/closureWithParameter.kt | 0 .../closureWithParameterAndBoxing.kt | 0 .../closures}/doubleEnclosedLocalVariable.kt | 0 .../closures}/enclosingLocalVariable.kt | 0 .../closures}/enclosingThis.kt | 0 .../closures}/extensionClosure.kt | 0 .../{regressions => box/closures}/kt2151.kt | 0 .../closures}/recursiveClosure.kt | 0 .../closures}/simplestClosure.kt | 0 .../closures}/simplestClosureAndBoxing.kt | 0 .../compareBoxedIntegerToZero.kt | 0 .../controlStructures/conditionOfEmptyIf.kt | 0 .../controlStructures/continueInFor.kt | 2 +- .../controlStructures/continueToLabelInFor.kt | 2 +- .../controlStructures/finallyOnEmptyReturn.kt | 0 .../forInSmartCastedToArray.kt | 0 .../controlStructures/forIntArray.kt | 2 +- .../controlStructures/forIntRange.kt | 2 +- .../forLoopMemberExtensionAll.kt | 0 .../forLoopMemberExtensionHasNext.kt | 0 .../forLoopMemberExtensionNext.kt | 0 .../controlStructures/forNullableIntArray.kt | 2 +- .../controlStructures/forPrimitiveIntArray.kt | 2 +- .../controlStructures/forUserType.kt | 0 .../inRangeConditionsInWhen.kt | 2 +- .../controlStructures}/kt1441.kt | 0 .../controlStructures}/kt1688.kt | 0 .../controlStructures}/kt1742.kt | 0 .../controlStructures}/kt1899.kt | 0 .../controlStructures}/kt2062.kt | 0 .../controlStructures}/kt2147.kt | 0 .../controlStructures}/kt2259.kt | 0 .../controlStructures}/kt2291.kt | 0 .../controlStructures}/kt237.kt | 2 +- .../controlStructures}/kt2416.kt | 0 .../controlStructures}/kt2577.kt | 0 .../controlStructures}/kt2597.kt | 0 .../controlStructures}/kt2598.kt | 0 .../controlStructures}/kt299.kt | 2 +- .../controlStructures}/kt3087.kt | 0 .../controlStructures}/kt3203_1.kt | 0 .../controlStructures}/kt3203_2.kt | 0 .../controlStructures}/kt3273.kt | 2 +- .../controlStructures}/kt416.kt | 2 +- .../controlStructures}/kt513.kt | 2 +- .../controlStructures}/kt628.kt | 2 +- .../controlStructures}/kt769.kt | 2 +- .../controlStructures}/kt772.kt | 2 +- .../controlStructures}/kt773.kt | 2 +- .../controlStructures}/kt870.kt | 2 +- .../controlStructures}/kt910.kt | 0 .../codegen/box/controlStructures/kt958.kt | 3 + .../controlStructures}/kt998.kt | 2 +- .../{ => box}/controlStructures/longRange.kt | 2 +- .../{ => box}/controlStructures/quicksort.kt | 0 .../controlStructures/tryCatchFinallyChain.kt | 0 .../{ => box}/enum/abstractMethodInEnum.kt | 0 .../codegen/{ => box}/enum/abstractmethod.kt | 2 +- .../{ => box}/enum/asReturnExpression.kt | 0 .../codegen/{ => box}/enum/entrywithinner.kt | 2 +- .../codegen/{ => box}/enum/inFunction.kt | 2 +- .../codegen/{ => box}/enum/inPackage.kt | 28 +- .../codegen/{ => box}/enum/inclassobj.kt | 2 +- .../testData/codegen/{ => box}/enum/inner.kt | 0 .../enum/innerWithExistingClassObject.kt | 0 .../{regressions => box/enum}/kt1119.kt | 0 .../{regressions => box/enum}/kt2350.kt | 0 .../{regressions => box/enum}/kt2673.kt | 0 .../testData/codegen/{ => box}/enum/name.kt | 0 .../codegen/{ => box}/enum/ordinal.kt | 0 .../testData/codegen/{ => box}/enum/simple.kt | 0 .../codegen/{ => box}/enum/toString.kt | 0 .../codegen/{ => box}/enum/valueof.kt | 0 .../extensionFunctions}/kt1061.kt | 0 .../extensionFunctions}/kt1249.kt | 0 .../extensionFunctions}/kt1290.kt | 0 .../extensionFunctions}/kt1953.kt | 0 .../extensionFunctions}/kt1953_class.kt | 0 .../extensionFunctions}/kt475.kt | 0 .../extensionFunctions}/kt606.kt | 2 +- .../extensionFunctions}/kt865.kt | 2 +- .../{ => box}/extensionFunctions/nested2.kt | 0 .../{ => box}/extensionFunctions/shared.kt | 0 .../{ => box}/extensionFunctions/virtual.kt | 0 .../{ => box}/functions/defaultargs.kt | 0 .../{ => box}/functions/defaultargs1.kt | 0 .../{ => box}/functions/defaultargs2.kt | 0 .../{ => box}/functions/defaultargs3.kt | 0 .../{ => box}/functions/defaultargs4.kt | 0 .../{ => box}/functions/defaultargs5.kt | 0 .../{ => box}/functions/defaultargs6.kt | 0 .../{ => box}/functions/defaultargs7.kt | 0 .../{regressions => box/functions}/ea33909.kt | 0 .../{ => box}/functions/functionExpression.kt | 0 .../codegen/{ => box}/functions/invoke.kt | 2 +- .../{regressions => box/functions}/kt1038.kt | 0 .../{regressions => box/functions}/kt1199.kt | 0 .../{regressions => box/functions}/kt1413.kt | 2 +- .../functions}/kt1649_1.kt | 0 .../functions}/kt1649_2.kt | 0 .../{regressions => box/functions}/kt1739.kt | 2 +- .../{regressions => box/functions}/kt2270.kt | 0 .../testData/codegen/box/functions/kt2271.kt | 3 + .../{regressions => box/functions}/kt2280.kt | 0 .../{regressions => box/functions}/kt2481.kt | 0 .../{regressions => box/functions}/kt2716.kt | 0 .../{regressions => box/functions}/kt2739.kt | 2 +- .../{regressions => box/functions}/kt2929.kt | 0 .../{regressions => box/functions}/kt395.kt | 0 .../{regressions => box/functions}/kt785.kt | 2 +- .../{regressions => box/functions}/kt873.kt | 2 +- .../{ => box}/functions/localFunction.kt | 2 +- .../{ => box}/functions/nothisnoclosure.kt | 2 +- .../{localcls => box/localClasses}/enum.kt | 0 .../localClasses}/noclosure.kt | 0 .../{localcls => box/localClasses}/object.kt | 0 .../localClasses}/withclosure.kt | 0 .../codegen/{ => box/namespace}/checkCast.kt | 0 .../{ => box/namespace}/incrementProperty.kt | 0 .../{ => box/namespace}/invokespecial.kt | 0 .../namespace}/namespaceQualifiedMethod.kt | 0 .../privateTopLevelPropAndVarInInner.kt | 0 .../codegen/{ => box}/objects/flist.kt | 2 +- .../{regressions => box/objects}/kt1047.kt | 2 +- .../{regressions => box/objects}/kt1136.kt | 2 +- .../{regressions => box/objects}/kt1186.kt | 2 +- .../{regressions => box/objects}/kt1600.kt | 0 .../{regressions => box/objects}/kt1737.kt | 0 .../{regressions => box/objects}/kt2398.kt | 0 .../{regressions => box/objects}/kt2663.kt | 2 +- .../{regressions => box/objects}/kt2663_2.kt | 2 +- .../{regressions => box/objects}/kt2675.kt | 0 .../{regressions => box/objects}/kt2719.kt | 2 +- .../{regressions => box/objects}/kt2822.kt | 0 .../{regressions => box/objects}/kt3238.kt | 0 .../{regressions => box/objects}/kt535.kt | 2 +- .../{regressions => box/objects}/kt560.kt | 0 .../{regressions => box/objects}/kt640.kt | 0 .../{regressions => box/objects}/kt694.kt | 0 .../{ => box}/objects/methodOnObject.kt | 0 .../{ => box}/objects/objectLiteral.kt | 0 .../objects/objectLiteralInClosure.kt | 0 .../objects/receiverInConstructor.kt | 2 +- .../codegen/{ => box}/objects/simpleObject.kt | 0 .../{ => box}/objects/thisInConstructor.kt | 2 +- .../primitiveTypes}/ea35963.kt | 0 .../{ => box/primitiveTypes}/emptyRanges.kt | 0 .../primitiveTypes/intLiteralIsNotNull.kt | 0 .../primitiveTypes}/kt1054.kt | 2 +- .../primitiveTypes}/kt1055.kt | 2 +- .../primitiveTypes}/kt1093.kt | 0 .../primitiveTypes}/kt1508.kt | 2 +- .../primitiveTypes}/kt1634.kt | 0 .../primitiveTypes}/kt2251.kt | 2 +- .../primitiveTypes}/kt2269.kt | 2 +- .../primitiveTypes}/kt2275.kt | 0 .../primitiveTypes}/kt239.kt | 0 .../primitiveTypes}/kt242.kt | 2 +- .../primitiveTypes}/kt243.kt | 2 +- .../primitiveTypes}/kt248.kt | 0 .../primitiveTypes}/kt2794.kt | 2 +- .../primitiveTypes}/kt3078.kt | 0 .../primitiveTypes}/kt446.kt | 0 .../primitiveTypes}/kt518.kt | 2 +- .../codegen/{ => box}/primitiveTypes/kt665.kt | 0 .../primitiveTypes}/kt684.kt | 0 .../codegen/{ => box}/primitiveTypes/kt711.kt | 0 .../codegen/{ => box}/primitiveTypes/kt737.kt | 0 .../primitiveTypes}/kt752.kt | 2 +- .../primitiveTypes}/kt753.kt | 2 +- .../primitiveTypes}/kt756.kt | 2 +- .../primitiveTypes}/kt757.kt | 2 +- .../primitiveTypes}/kt765.kt | 2 +- .../primitiveTypes}/kt821.kt | 0 .../primitiveTypes}/kt877.kt | 0 .../primitiveTypes}/kt882.kt | 2 +- .../primitiveTypes}/kt887.kt | 2 +- .../primitiveTypes}/kt925.kt | 2 +- .../primitiveTypes}/kt935.kt | 2 +- .../primitiveTypes}/kt944.kt | 2 +- .../primitiveTypes}/kt945.kt | 0 .../primitiveTypes/nullAsNullableIntIsNull.kt | 0 .../primitiveTypes/unboxComparable.kt | 0 .../properties/accessToPrivateProperty.kt | 0 .../properties/accessToPrivateSetter.kt | 0 .../{regressions => box/properties}/kt1159.kt | 2 +- .../{regressions => box/properties}/kt1165.kt | 2 +- .../{regressions => box/properties}/kt1168.kt | 0 .../{regressions => box/properties}/kt1170.kt | 2 +- .../{regressions => box/properties}/kt1398.kt | 2 +- .../{regressions => box/properties}/kt1417.kt | 2 +- .../properties}/kt1482_2279.kt | 0 .../{regressions => box/properties}/kt1714.kt | 2 +- .../properties}/kt1714_minimal.kt | 2 +- .../{regressions => box/properties}/kt1892.kt | 2 +- .../{regressions => box/properties}/kt2331.kt | 2 +- .../{regressions => box/properties}/kt257.kt | 2 +- .../{regressions => box/properties}/kt2655.kt | 2 +- .../{regressions => box/properties}/kt2786.kt | 0 .../codegen/{ => box}/properties/kt2892.kt | 0 .../{regressions => box/properties}/kt613.kt | 2 +- .../{regressions => box/safeCall}/kt1572.kt | 0 .../{regressions => box/safeCall}/kt232.kt | 2 +- .../{regressions => box/safeCall}/kt245.kt | 2 +- .../{regressions => box/safeCall}/kt247.kt | 0 .../{regressions => box/strings}/ea35743.kt | 0 .../{regressions => box/strings}/kt881.kt | 2 +- .../{regressions => box/strings}/kt889.kt | 0 .../{regressions => box/strings}/kt894.kt | 2 +- .../strings}/multilineStringsWithTemplates.kt | 0 .../codegen/{ => box/strings}/rawStrings.kt | 2 +- .../{ => box}/super/basicmethodSuperClass.kt | 0 .../{ => box}/super/basicmethodSuperTrait.kt | 0 .../codegen/{ => box}/super/basicproperty.kt | 0 .../codegen/{ => box}/super/enclosedFun.kt | 0 .../codegen/{ => box}/super/enclosedVar.kt | 0 .../{ => box}/super/innerClassLabeledSuper.kt | 0 .../super/innerClassLabeledSuperProperty.kt | 0 .../{ => box}/super/multipleSuperTraits.kt | 0 .../codegen/{ => box}/super/traitproperty.kt | 0 .../codegen/{ => box}/traits/finalMethod.kt | 0 .../codegen/{ => box}/traits/inheritedFun.kt | 2 +- .../codegen/{ => box}/traits/inheritedVar.kt | 2 +- .../{regressions => box/traits}/kt1936_1.kt | 0 .../{regressions => box/traits}/kt1936_2.kt | 0 .../{regressions => box/traits}/kt2260.kt | 0 .../{regressions => box/traits}/kt2399.kt | 0 .../{regressions => box/traits}/kt2541.kt | 0 .../{regressions => box/traits}/kt2963.kt | 0 .../codegen/{ => box}/traits/multiple.kt | 0 .../codegen/{ => box}/traits/simple.kt | 2 +- .../codegen/{ => box}/traits/stdlib.kt | 0 .../codegen/{ => box}/traits/traitFuncCall.kt | 0 .../codegen/{ => box}/traits/withRequired.kt | 0 .../{ => box}/traits/withRequiredSuper.kt | 0 .../traits/withRequiredSuperViaBridge.kt | 0 .../codegen/{ => box}/typeInfo/asInLoop.kt | 0 .../codegen/{ => box}/typeInfo/inheritance.kt | 2 +- .../codegen/{ => box}/typeInfo/kt2811.kt | 2 +- .../{regressions => box/typeInfo}/kt511.kt | 0 .../{ => box}/typeInfo/primitiveTypeInfo.kt | 0 .../codegen/{tuples => box/unit}/UnitValue.kt | 2 +- .../{regressions => box/vararg}/kt1978.kt | 0 .../{regressions => box/vararg}/kt581.kt | 0 .../{regressions => box/vararg}/kt796_797.kt | 2 +- .../when}/callProperty.kt | 0 .../{patternMatching => box/when}/is.kt | 0 .../{regressions => box/when}/kt2457.kt | 0 .../{patternMatching => box/when}/kt2466.kt | 0 .../when}/longInRange.kt | 2 +- .../when}/matchNotNullAgainstNullable.kt | 0 .../when}/nullableWhen.kt | 0 .../{patternMatching => box/when}/range.kt | 2 +- .../when}/whenArgumentIsEvaluatedOnlyOnce.kt | 2 +- .../testData/codegen/regressions/kt2271.kt | 3 - .../testData/codegen/regressions/kt779.kt | 3 - .../testData/codegen/regressions/kt958.kt | 3 - .../jetbrains/jet/codegen/ArrayGenTest.java | 148 -------- .../jet/codegen/BridgeMethodGenTest.java | 171 --------- .../jetbrains/jet/codegen/ClassGenTest.java | 348 ------------------ .../jet/codegen/ClosuresGenTest.java | 67 ---- .../jet/codegen/ControlStructuresTest.java | 184 --------- .../jetbrains/jet/codegen/EnumGenTest.java | 68 ---- .../jet/codegen/ExtensionFunctionsTest.java | 44 --- .../jet/codegen/FunctionGenTest.java | 116 ------ .../jet/codegen/LocalClassGenTest.java | 43 --- .../jet/codegen/NamespaceGenTest.java | 20 - .../jetbrains/jet/codegen/ObjectGenTest.java | 119 ------ .../jet/codegen/PatternMatchingTest.java | 36 -- .../jet/codegen/PrimitiveTypesTest.java | 152 -------- .../jet/codegen/PropertyGenTest.java | 72 ---- .../jetbrains/jet/codegen/SafeRefTest.java | 43 --- .../jetbrains/jet/codegen/StringsTest.java | 24 -- .../jetbrains/jet/codegen/SuperGenTest.java | 36 -- .../org/jetbrains/jet/codegen/TraitsTest.java | 99 ----- .../jetbrains/jet/codegen/TupleGenTest.java | 27 -- .../jetbrains/jet/codegen/TypeInfoTest.java | 20 - .../org/jetbrains/jet/codegen/VarArgTest.java | 12 - 438 files changed, 156 insertions(+), 2005 deletions(-) rename compiler/testData/codegen/{ => box}/arrays/arrayGetAssignMultiIndex.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/arrayGetMultiIndex.kt (99%) rename compiler/testData/codegen/{ => box}/arrays/arrayPlusAssign.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/collectionAssignGetMultiIndex.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/collectionGetMultiIndex.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/forEachBooleanArray.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/forEachByteArray.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/forEachCharArray.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/forEachDoubleArray.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/forEachFloatArray.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/forEachIntArray.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/forEachLongArray.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/forEachShortArray.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/hashMap.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/indices.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/indicesChar.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/iterator.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/iteratorBooleanArray.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/iteratorByteArray.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/iteratorByteArrayNextByte.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/iteratorCharArray.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/iteratorDoubleArray.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/iteratorFloatArray.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/iteratorIntArray.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/iteratorLongArray.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/iteratorLongArrayNextLong.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/iteratorShortArray.kt (100%) rename compiler/testData/codegen/{regressions => box/arrays}/kt238.kt (99%) rename compiler/testData/codegen/{regressions => box/arrays}/kt2997.kt (100%) rename compiler/testData/codegen/{regressions => box/arrays}/kt33.kt (98%) rename compiler/testData/codegen/{regressions => box/arrays}/kt503.kt (95%) rename compiler/testData/codegen/{regressions => box/arrays}/kt594.kt (99%) rename compiler/testData/codegen/{regressions => box/arrays}/kt602.kt (100%) create mode 100644 compiler/testData/codegen/box/arrays/kt779.kt rename compiler/testData/codegen/{regressions => box/arrays}/kt950.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/longAsIndex.kt (100%) rename compiler/testData/codegen/{ => box}/arrays/nonNullArray.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/delegation.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/delegationProperty.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/delegationToTraitImpl.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/diamond.kt (100%) rename compiler/testData/codegen/{regressions => box/bridges}/kt1939.kt (100%) rename compiler/testData/codegen/{regressions => box/bridges}/kt1959.kt (100%) rename compiler/testData/codegen/{regressions => box/bridges}/kt2498.kt (100%) rename compiler/testData/codegen/{regressions => box/bridges}/kt2702.kt (100%) rename compiler/testData/codegen/{regressions => box/bridges}/kt2833.kt (100%) rename compiler/testData/codegen/{regressions => box/bridges}/kt2920.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/longChainOneBridge.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/manyTypeArgumentsSubstitutedSuccessively.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/methodFromTrait.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/overrideAbstractProperty.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/overrideReturnType.kt (99%) rename compiler/testData/codegen/{ => box}/bridges/propertyAccessorsWithoutBody.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/propertyDiamond.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/propertyInConstructor.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/propertySetter.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/simple.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/simpleEnum.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/simpleGenericMethod.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/simpleObject.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/simpleReturnType.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/simpleUpperBound.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/substitutionInSuperClass.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/substitutionInSuperClassAbstractFun.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/substitutionInSuperClassBoundedTypeArguments.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/substitutionInSuperClassDelegation.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/substitutionInSuperClassEnum.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/substitutionInSuperClassGenericMethod.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/substitutionInSuperClassObject.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/substitutionInSuperClassProperty.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/substitutionInSuperClassUpperBound.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/twoParentsWithDifferentMethodsTwoBridges.kt (100%) rename compiler/testData/codegen/{ => box}/bridges/twoParentsWithTheSameMethodOneBridge.kt (100%) rename compiler/testData/codegen/{ => box}/classes/classObject.kt (100%) rename compiler/testData/codegen/{ => box}/classes/classObjectField.kt (100%) rename compiler/testData/codegen/{ => box}/classes/classObjectInTrait.kt (100%) rename compiler/testData/codegen/{ => box}/classes/delegation2.kt (99%) rename compiler/testData/codegen/{ => box}/classes/delegation3.kt (100%) rename compiler/testData/codegen/{ => box}/classes/delegation4.kt (99%) rename compiler/testData/codegen/{ => box}/classes/delegationGenericArg.kt (100%) rename compiler/testData/codegen/{ => box}/classes/delegationGenericArgUpperBound.kt (100%) rename compiler/testData/codegen/{ => box}/classes/delegationGenericLongArg.kt (100%) rename compiler/testData/codegen/{ => box}/classes/delegationJava.kt (100%) rename compiler/testData/codegen/{ => box}/classes/delegationMethodsWithArgs.kt (99%) rename compiler/testData/codegen/{ => box}/classes/diamondInheritance.kt (99%) rename compiler/testData/codegen/{ => box}/classes/exceptionConstructor.kt (100%) rename compiler/testData/codegen/{ => box}/classes/funDelegation.kt (99%) rename compiler/testData/codegen/{ => box}/classes/inheritance.kt (99%) rename compiler/testData/codegen/{ => box}/classes/inheritedInnerClass.kt (100%) rename compiler/testData/codegen/{ => box}/classes/inheritedMethod.kt (100%) rename compiler/testData/codegen/{ => box}/classes/initializerBlock.kt (100%) rename compiler/testData/codegen/{ => box}/classes/initializerBlockDImpl.kt (100%) rename compiler/testData/codegen/{ => box}/classes/innerClass.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt1018.kt (92%) rename compiler/testData/codegen/{regressions => box/classes}/kt1120.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt1134.kt (98%) rename compiler/testData/codegen/{regressions => box/classes}/kt1157.kt (99%) rename compiler/testData/codegen/{regressions => box/classes}/kt1247.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt1345.kt (80%) rename compiler/testData/codegen/{regressions => box/classes}/kt1439.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt1535.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt1538.kt (99%) rename compiler/testData/codegen/{regressions => box/classes}/kt1578.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt1611.kt (98%) rename compiler/testData/codegen/{regressions => box/classes}/kt1721.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt1726.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt1759.kt (99%) rename compiler/testData/codegen/{regressions => box/classes}/kt1891.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt1918.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt1976.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt1980.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt2224.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt2288.kt (86%) rename compiler/testData/codegen/{regressions => box/classes}/kt2384.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt2390.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt2391.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt2395.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt2417.kt (99%) rename compiler/testData/codegen/{regressions => box/classes}/kt2477.kt (99%) rename compiler/testData/codegen/{regressions => box/classes}/kt2480.kt (99%) rename compiler/testData/codegen/{regressions => box/classes}/kt2482.kt (99%) rename compiler/testData/codegen/{regressions => box/classes}/kt2485.kt (98%) rename compiler/testData/codegen/{regressions => box/classes}/kt249.kt (100%) rename compiler/testData/codegen/{ => box}/classes/kt2532.kt (99%) rename compiler/testData/codegen/{regressions => box/classes}/kt2566.kt (88%) rename compiler/testData/codegen/{regressions => box/classes}/kt2566_2.kt (91%) rename compiler/testData/codegen/{regressions => box/classes}/kt2607.kt (98%) rename compiler/testData/codegen/{regressions => box/classes}/kt2626.kt (98%) rename compiler/testData/codegen/{regressions => box/classes}/kt2711.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt285.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt343.kt (99%) rename compiler/testData/codegen/{regressions => box/classes}/kt454.kt (98%) rename compiler/testData/codegen/{regressions => box/classes}/kt471.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt48.kt (99%) rename compiler/testData/codegen/{regressions => box/classes}/kt496.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt500.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt501.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt504.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt508.kt (100%) rename compiler/testData/codegen/{regressions => box/classes}/kt633.kt (99%) rename compiler/testData/codegen/{regressions => box/classes}/kt707.kt (99%) rename compiler/testData/codegen/{regressions => box/classes}/kt723.kt (99%) rename compiler/testData/codegen/{regressions => box/classes}/kt725.kt (98%) rename compiler/testData/codegen/{regressions => box/classes}/kt903.kt (99%) rename compiler/testData/codegen/{regressions => box/classes}/kt940.kt (100%) rename compiler/testData/codegen/{ => box}/classes/outerThis.kt (100%) rename compiler/testData/codegen/{ => box}/classes/overloadBinaryOperator.kt (100%) rename compiler/testData/codegen/{ => box}/classes/overloadPlusAssign.kt (100%) rename compiler/testData/codegen/{ => box}/classes/overloadPlusAssignReturn.kt (100%) rename compiler/testData/codegen/{ => box}/classes/overloadPlusToPlusAssign.kt (100%) rename compiler/testData/codegen/{ => box}/classes/overloadUnaryOperator.kt (100%) rename compiler/testData/codegen/{ => box}/classes/privateOuterFunctions.kt (95%) rename compiler/testData/codegen/{ => box}/classes/privateOuterProperty.kt (88%) rename compiler/testData/codegen/{ => box}/classes/propertyDelegation.kt (99%) rename compiler/testData/codegen/{ => box}/classes/propertyInInitializer.kt (100%) rename compiler/testData/codegen/{ => box}/classes/resolveOrder.kt (100%) rename compiler/testData/codegen/{ => box}/classes/rightHandOverride.kt (99%) rename compiler/testData/codegen/{ => box}/classes/selfcreate.kt (98%) rename compiler/testData/codegen/{ => box}/classes/simpleBox.kt (100%) rename compiler/testData/codegen/{ => box}/classes/typedDelegation.kt (99%) rename compiler/testData/codegen/{classes => box/closures}/closureWithParameter.kt (100%) rename compiler/testData/codegen/{classes => box/closures}/closureWithParameterAndBoxing.kt (100%) rename compiler/testData/codegen/{classes => box/closures}/doubleEnclosedLocalVariable.kt (100%) rename compiler/testData/codegen/{classes => box/closures}/enclosingLocalVariable.kt (100%) rename compiler/testData/codegen/{classes => box/closures}/enclosingThis.kt (100%) rename compiler/testData/codegen/{classes => box/closures}/extensionClosure.kt (100%) rename compiler/testData/codegen/{regressions => box/closures}/kt2151.kt (100%) rename compiler/testData/codegen/{classes => box/closures}/recursiveClosure.kt (100%) rename compiler/testData/codegen/{classes => box/closures}/simplestClosure.kt (100%) rename compiler/testData/codegen/{classes => box/closures}/simplestClosureAndBoxing.kt (100%) rename compiler/testData/codegen/{ => box}/controlStructures/compareBoxedIntegerToZero.kt (100%) rename compiler/testData/codegen/{ => box}/controlStructures/conditionOfEmptyIf.kt (100%) rename compiler/testData/codegen/{ => box}/controlStructures/continueInFor.kt (99%) rename compiler/testData/codegen/{ => box}/controlStructures/continueToLabelInFor.kt (99%) rename compiler/testData/codegen/{ => box}/controlStructures/finallyOnEmptyReturn.kt (100%) rename compiler/testData/codegen/{ => box}/controlStructures/forInSmartCastedToArray.kt (100%) rename compiler/testData/codegen/{ => box}/controlStructures/forIntArray.kt (99%) rename compiler/testData/codegen/{ => box}/controlStructures/forIntRange.kt (99%) rename compiler/testData/codegen/{ => box}/controlStructures/forLoopMemberExtensionAll.kt (100%) rename compiler/testData/codegen/{ => box}/controlStructures/forLoopMemberExtensionHasNext.kt (100%) rename compiler/testData/codegen/{ => box}/controlStructures/forLoopMemberExtensionNext.kt (100%) rename compiler/testData/codegen/{ => box}/controlStructures/forNullableIntArray.kt (99%) rename compiler/testData/codegen/{ => box}/controlStructures/forPrimitiveIntArray.kt (99%) rename compiler/testData/codegen/{ => box}/controlStructures/forUserType.kt (100%) rename compiler/testData/codegen/{ => box}/controlStructures/inRangeConditionsInWhen.kt (98%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt1441.kt (100%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt1688.kt (100%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt1742.kt (100%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt1899.kt (100%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt2062.kt (100%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt2147.kt (100%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt2259.kt (100%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt2291.kt (100%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt237.kt (99%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt2416.kt (100%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt2577.kt (100%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt2597.kt (100%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt2598.kt (100%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt299.kt (99%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt3087.kt (100%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt3203_1.kt (100%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt3203_2.kt (100%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt3273.kt (99%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt416.kt (97%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt513.kt (99%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt628.kt (99%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt769.kt (98%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt772.kt (99%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt773.kt (99%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt870.kt (93%) rename compiler/testData/codegen/{regressions => box/controlStructures}/kt910.kt (100%) create mode 100644 compiler/testData/codegen/box/controlStructures/kt958.kt rename compiler/testData/codegen/{regressions => box/controlStructures}/kt998.kt (99%) rename compiler/testData/codegen/{ => box}/controlStructures/longRange.kt (98%) rename compiler/testData/codegen/{ => box}/controlStructures/quicksort.kt (100%) rename compiler/testData/codegen/{ => box}/controlStructures/tryCatchFinallyChain.kt (100%) rename compiler/testData/codegen/{ => box}/enum/abstractMethodInEnum.kt (100%) rename compiler/testData/codegen/{ => box}/enum/abstractmethod.kt (99%) rename compiler/testData/codegen/{ => box}/enum/asReturnExpression.kt (100%) rename compiler/testData/codegen/{ => box}/enum/entrywithinner.kt (99%) rename compiler/testData/codegen/{ => box}/enum/inFunction.kt (83%) rename compiler/testData/codegen/{ => box}/enum/inPackage.kt (92%) rename compiler/testData/codegen/{ => box}/enum/inclassobj.kt (99%) rename compiler/testData/codegen/{ => box}/enum/inner.kt (100%) rename compiler/testData/codegen/{ => box}/enum/innerWithExistingClassObject.kt (100%) rename compiler/testData/codegen/{regressions => box/enum}/kt1119.kt (100%) rename compiler/testData/codegen/{regressions => box/enum}/kt2350.kt (100%) rename compiler/testData/codegen/{regressions => box/enum}/kt2673.kt (100%) rename compiler/testData/codegen/{ => box}/enum/name.kt (100%) rename compiler/testData/codegen/{ => box}/enum/ordinal.kt (100%) rename compiler/testData/codegen/{ => box}/enum/simple.kt (100%) rename compiler/testData/codegen/{ => box}/enum/toString.kt (100%) rename compiler/testData/codegen/{ => box}/enum/valueof.kt (100%) rename compiler/testData/codegen/{regressions => box/extensionFunctions}/kt1061.kt (100%) rename compiler/testData/codegen/{regressions => box/extensionFunctions}/kt1249.kt (100%) rename compiler/testData/codegen/{regressions => box/extensionFunctions}/kt1290.kt (100%) rename compiler/testData/codegen/{regressions => box/extensionFunctions}/kt1953.kt (100%) rename compiler/testData/codegen/{regressions => box/extensionFunctions}/kt1953_class.kt (100%) rename compiler/testData/codegen/{regressions => box/extensionFunctions}/kt475.kt (100%) rename compiler/testData/codegen/{regressions => box/extensionFunctions}/kt606.kt (99%) rename compiler/testData/codegen/{regressions => box/extensionFunctions}/kt865.kt (99%) rename compiler/testData/codegen/{ => box}/extensionFunctions/nested2.kt (100%) rename compiler/testData/codegen/{ => box}/extensionFunctions/shared.kt (100%) rename compiler/testData/codegen/{ => box}/extensionFunctions/virtual.kt (100%) rename compiler/testData/codegen/{ => box}/functions/defaultargs.kt (100%) rename compiler/testData/codegen/{ => box}/functions/defaultargs1.kt (100%) rename compiler/testData/codegen/{ => box}/functions/defaultargs2.kt (100%) rename compiler/testData/codegen/{ => box}/functions/defaultargs3.kt (100%) rename compiler/testData/codegen/{ => box}/functions/defaultargs4.kt (100%) rename compiler/testData/codegen/{ => box}/functions/defaultargs5.kt (100%) rename compiler/testData/codegen/{ => box}/functions/defaultargs6.kt (100%) rename compiler/testData/codegen/{ => box}/functions/defaultargs7.kt (100%) rename compiler/testData/codegen/{regressions => box/functions}/ea33909.kt (100%) rename compiler/testData/codegen/{ => box}/functions/functionExpression.kt (100%) rename compiler/testData/codegen/{ => box}/functions/invoke.kt (99%) rename compiler/testData/codegen/{regressions => box/functions}/kt1038.kt (100%) rename compiler/testData/codegen/{regressions => box/functions}/kt1199.kt (100%) rename compiler/testData/codegen/{regressions => box/functions}/kt1413.kt (99%) rename compiler/testData/codegen/{regressions => box/functions}/kt1649_1.kt (100%) rename compiler/testData/codegen/{regressions => box/functions}/kt1649_2.kt (100%) rename compiler/testData/codegen/{regressions => box/functions}/kt1739.kt (99%) rename compiler/testData/codegen/{regressions => box/functions}/kt2270.kt (100%) create mode 100644 compiler/testData/codegen/box/functions/kt2271.kt rename compiler/testData/codegen/{regressions => box/functions}/kt2280.kt (100%) rename compiler/testData/codegen/{regressions => box/functions}/kt2481.kt (100%) rename compiler/testData/codegen/{regressions => box/functions}/kt2716.kt (100%) rename compiler/testData/codegen/{regressions => box/functions}/kt2739.kt (99%) rename compiler/testData/codegen/{regressions => box/functions}/kt2929.kt (100%) rename compiler/testData/codegen/{regressions => box/functions}/kt395.kt (100%) rename compiler/testData/codegen/{regressions => box/functions}/kt785.kt (98%) rename compiler/testData/codegen/{regressions => box/functions}/kt873.kt (98%) rename compiler/testData/codegen/{ => box}/functions/localFunction.kt (99%) rename compiler/testData/codegen/{ => box}/functions/nothisnoclosure.kt (99%) rename compiler/testData/codegen/{localcls => box/localClasses}/enum.kt (100%) rename compiler/testData/codegen/{localcls => box/localClasses}/noclosure.kt (100%) rename compiler/testData/codegen/{localcls => box/localClasses}/object.kt (100%) rename compiler/testData/codegen/{localcls => box/localClasses}/withclosure.kt (100%) rename compiler/testData/codegen/{ => box/namespace}/checkCast.kt (100%) rename compiler/testData/codegen/{ => box/namespace}/incrementProperty.kt (100%) rename compiler/testData/codegen/{ => box/namespace}/invokespecial.kt (100%) rename compiler/testData/codegen/{ => box/namespace}/namespaceQualifiedMethod.kt (100%) rename compiler/testData/codegen/{ => box/namespace}/privateTopLevelPropAndVarInInner.kt (100%) rename compiler/testData/codegen/{ => box}/objects/flist.kt (99%) rename compiler/testData/codegen/{regressions => box/objects}/kt1047.kt (99%) rename compiler/testData/codegen/{regressions => box/objects}/kt1136.kt (99%) rename compiler/testData/codegen/{regressions => box/objects}/kt1186.kt (97%) rename compiler/testData/codegen/{regressions => box/objects}/kt1600.kt (100%) rename compiler/testData/codegen/{regressions => box/objects}/kt1737.kt (100%) rename compiler/testData/codegen/{regressions => box/objects}/kt2398.kt (100%) rename compiler/testData/codegen/{regressions => box/objects}/kt2663.kt (98%) rename compiler/testData/codegen/{regressions => box/objects}/kt2663_2.kt (98%) rename compiler/testData/codegen/{regressions => box/objects}/kt2675.kt (100%) rename compiler/testData/codegen/{regressions => box/objects}/kt2719.kt (86%) rename compiler/testData/codegen/{regressions => box/objects}/kt2822.kt (100%) rename compiler/testData/codegen/{regressions => box/objects}/kt3238.kt (100%) rename compiler/testData/codegen/{regressions => box/objects}/kt535.kt (99%) rename compiler/testData/codegen/{regressions => box/objects}/kt560.kt (100%) rename compiler/testData/codegen/{regressions => box/objects}/kt640.kt (100%) rename compiler/testData/codegen/{regressions => box/objects}/kt694.kt (100%) rename compiler/testData/codegen/{ => box}/objects/methodOnObject.kt (100%) rename compiler/testData/codegen/{ => box}/objects/objectLiteral.kt (100%) rename compiler/testData/codegen/{ => box}/objects/objectLiteralInClosure.kt (100%) rename compiler/testData/codegen/{ => box}/objects/receiverInConstructor.kt (80%) rename compiler/testData/codegen/{ => box}/objects/simpleObject.kt (100%) rename compiler/testData/codegen/{ => box}/objects/thisInConstructor.kt (85%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/ea35963.kt (100%) rename compiler/testData/codegen/{ => box/primitiveTypes}/emptyRanges.kt (100%) rename compiler/testData/codegen/{ => box}/primitiveTypes/intLiteralIsNotNull.kt (100%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt1054.kt (99%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt1055.kt (98%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt1093.kt (100%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt1508.kt (98%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt1634.kt (100%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt2251.kt (99%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt2269.kt (99%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt2275.kt (100%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt239.kt (100%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt242.kt (99%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt243.kt (99%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt248.kt (100%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt2794.kt (99%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt3078.kt (100%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt446.kt (100%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt518.kt (99%) rename compiler/testData/codegen/{ => box}/primitiveTypes/kt665.kt (100%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt684.kt (100%) rename compiler/testData/codegen/{ => box}/primitiveTypes/kt711.kt (100%) rename compiler/testData/codegen/{ => box}/primitiveTypes/kt737.kt (100%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt752.kt (99%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt753.kt (98%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt756.kt (99%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt757.kt (98%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt765.kt (99%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt821.kt (100%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt877.kt (100%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt882.kt (98%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt887.kt (95%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt925.kt (99%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt935.kt (94%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt944.kt (98%) rename compiler/testData/codegen/{regressions => box/primitiveTypes}/kt945.kt (100%) rename compiler/testData/codegen/{ => box}/primitiveTypes/nullAsNullableIntIsNull.kt (100%) rename compiler/testData/codegen/{ => box}/primitiveTypes/unboxComparable.kt (100%) rename compiler/testData/codegen/{ => box}/properties/accessToPrivateProperty.kt (100%) rename compiler/testData/codegen/{ => box}/properties/accessToPrivateSetter.kt (100%) rename compiler/testData/codegen/{regressions => box/properties}/kt1159.kt (99%) rename compiler/testData/codegen/{regressions => box/properties}/kt1165.kt (99%) rename compiler/testData/codegen/{regressions => box/properties}/kt1168.kt (100%) rename compiler/testData/codegen/{regressions => box/properties}/kt1170.kt (99%) rename compiler/testData/codegen/{regressions => box/properties}/kt1398.kt (79%) rename compiler/testData/codegen/{regressions => box/properties}/kt1417.kt (66%) rename compiler/testData/codegen/{regressions => box/properties}/kt1482_2279.kt (100%) rename compiler/testData/codegen/{regressions => box/properties}/kt1714.kt (99%) rename compiler/testData/codegen/{regressions => box/properties}/kt1714_minimal.kt (98%) rename compiler/testData/codegen/{regressions => box/properties}/kt1892.kt (66%) rename compiler/testData/codegen/{regressions => box/properties}/kt2331.kt (98%) rename compiler/testData/codegen/{regressions => box/properties}/kt257.kt (99%) rename compiler/testData/codegen/{regressions => box/properties}/kt2655.kt (99%) rename compiler/testData/codegen/{regressions => box/properties}/kt2786.kt (100%) rename compiler/testData/codegen/{ => box}/properties/kt2892.kt (100%) rename compiler/testData/codegen/{regressions => box/properties}/kt613.kt (99%) rename compiler/testData/codegen/{regressions => box/safeCall}/kt1572.kt (100%) rename compiler/testData/codegen/{regressions => box/safeCall}/kt232.kt (98%) rename compiler/testData/codegen/{regressions => box/safeCall}/kt245.kt (99%) rename compiler/testData/codegen/{regressions => box/safeCall}/kt247.kt (100%) rename compiler/testData/codegen/{regressions => box/strings}/ea35743.kt (100%) rename compiler/testData/codegen/{regressions => box/strings}/kt881.kt (98%) rename compiler/testData/codegen/{regressions => box/strings}/kt889.kt (100%) rename compiler/testData/codegen/{regressions => box/strings}/kt894.kt (98%) rename compiler/testData/codegen/{ => box/strings}/multilineStringsWithTemplates.kt (100%) rename compiler/testData/codegen/{ => box/strings}/rawStrings.kt (98%) rename compiler/testData/codegen/{ => box}/super/basicmethodSuperClass.kt (100%) rename compiler/testData/codegen/{ => box}/super/basicmethodSuperTrait.kt (100%) rename compiler/testData/codegen/{ => box}/super/basicproperty.kt (100%) rename compiler/testData/codegen/{ => box}/super/enclosedFun.kt (100%) rename compiler/testData/codegen/{ => box}/super/enclosedVar.kt (100%) rename compiler/testData/codegen/{ => box}/super/innerClassLabeledSuper.kt (100%) rename compiler/testData/codegen/{ => box}/super/innerClassLabeledSuperProperty.kt (100%) rename compiler/testData/codegen/{ => box}/super/multipleSuperTraits.kt (100%) rename compiler/testData/codegen/{ => box}/super/traitproperty.kt (100%) rename compiler/testData/codegen/{ => box}/traits/finalMethod.kt (100%) rename compiler/testData/codegen/{ => box}/traits/inheritedFun.kt (98%) rename compiler/testData/codegen/{ => box}/traits/inheritedVar.kt (98%) rename compiler/testData/codegen/{regressions => box/traits}/kt1936_1.kt (100%) rename compiler/testData/codegen/{regressions => box/traits}/kt1936_2.kt (100%) rename compiler/testData/codegen/{regressions => box/traits}/kt2260.kt (100%) rename compiler/testData/codegen/{regressions => box/traits}/kt2399.kt (100%) rename compiler/testData/codegen/{regressions => box/traits}/kt2541.kt (100%) rename compiler/testData/codegen/{regressions => box/traits}/kt2963.kt (100%) rename compiler/testData/codegen/{ => box}/traits/multiple.kt (100%) rename compiler/testData/codegen/{ => box}/traits/simple.kt (99%) rename compiler/testData/codegen/{ => box}/traits/stdlib.kt (100%) rename compiler/testData/codegen/{ => box}/traits/traitFuncCall.kt (100%) rename compiler/testData/codegen/{ => box}/traits/withRequired.kt (100%) rename compiler/testData/codegen/{ => box}/traits/withRequiredSuper.kt (100%) rename compiler/testData/codegen/{ => box}/traits/withRequiredSuperViaBridge.kt (100%) rename compiler/testData/codegen/{ => box}/typeInfo/asInLoop.kt (100%) rename compiler/testData/codegen/{ => box}/typeInfo/inheritance.kt (99%) rename compiler/testData/codegen/{ => box}/typeInfo/kt2811.kt (99%) rename compiler/testData/codegen/{regressions => box/typeInfo}/kt511.kt (100%) rename compiler/testData/codegen/{ => box}/typeInfo/primitiveTypeInfo.kt (100%) rename compiler/testData/codegen/{tuples => box/unit}/UnitValue.kt (97%) rename compiler/testData/codegen/{regressions => box/vararg}/kt1978.kt (100%) rename compiler/testData/codegen/{regressions => box/vararg}/kt581.kt (100%) rename compiler/testData/codegen/{regressions => box/vararg}/kt796_797.kt (99%) rename compiler/testData/codegen/{patternMatching => box/when}/callProperty.kt (100%) rename compiler/testData/codegen/{patternMatching => box/when}/is.kt (100%) rename compiler/testData/codegen/{regressions => box/when}/kt2457.kt (100%) rename compiler/testData/codegen/{patternMatching => box/when}/kt2466.kt (100%) rename compiler/testData/codegen/{patternMatching => box/when}/longInRange.kt (98%) rename compiler/testData/codegen/{patternMatching => box/when}/matchNotNullAgainstNullable.kt (100%) rename compiler/testData/codegen/{patternMatching => box/when}/nullableWhen.kt (100%) rename compiler/testData/codegen/{patternMatching => box/when}/range.kt (99%) rename compiler/testData/codegen/{patternMatching => box/when}/whenArgumentIsEvaluatedOnlyOnce.kt (99%) delete mode 100644 compiler/testData/codegen/regressions/kt2271.kt delete mode 100644 compiler/testData/codegen/regressions/kt779.kt delete mode 100644 compiler/testData/codegen/regressions/kt958.kt delete mode 100644 compiler/tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java delete mode 100644 compiler/tests/org/jetbrains/jet/codegen/ClosuresGenTest.java delete mode 100644 compiler/tests/org/jetbrains/jet/codegen/LocalClassGenTest.java delete mode 100644 compiler/tests/org/jetbrains/jet/codegen/ObjectGenTest.java delete mode 100644 compiler/tests/org/jetbrains/jet/codegen/SafeRefTest.java delete mode 100644 compiler/tests/org/jetbrains/jet/codegen/TraitsTest.java delete mode 100644 compiler/tests/org/jetbrains/jet/codegen/TupleGenTest.java diff --git a/compiler/testData/codegen/arrays/arrayGetAssignMultiIndex.kt b/compiler/testData/codegen/box/arrays/arrayGetAssignMultiIndex.kt similarity index 100% rename from compiler/testData/codegen/arrays/arrayGetAssignMultiIndex.kt rename to compiler/testData/codegen/box/arrays/arrayGetAssignMultiIndex.kt diff --git a/compiler/testData/codegen/arrays/arrayGetMultiIndex.kt b/compiler/testData/codegen/box/arrays/arrayGetMultiIndex.kt similarity index 99% rename from compiler/testData/codegen/arrays/arrayGetMultiIndex.kt rename to compiler/testData/codegen/box/arrays/arrayGetMultiIndex.kt index 3120a453ce1..e476b7e8d57 100644 --- a/compiler/testData/codegen/arrays/arrayGetMultiIndex.kt +++ b/compiler/testData/codegen/box/arrays/arrayGetMultiIndex.kt @@ -8,4 +8,4 @@ fun box(): String { s[1, -1] = "OK" return s[-2, 2] } - \ No newline at end of file + diff --git a/compiler/testData/codegen/arrays/arrayPlusAssign.kt b/compiler/testData/codegen/box/arrays/arrayPlusAssign.kt similarity index 100% rename from compiler/testData/codegen/arrays/arrayPlusAssign.kt rename to compiler/testData/codegen/box/arrays/arrayPlusAssign.kt diff --git a/compiler/testData/codegen/arrays/collectionAssignGetMultiIndex.kt b/compiler/testData/codegen/box/arrays/collectionAssignGetMultiIndex.kt similarity index 100% rename from compiler/testData/codegen/arrays/collectionAssignGetMultiIndex.kt rename to compiler/testData/codegen/box/arrays/collectionAssignGetMultiIndex.kt diff --git a/compiler/testData/codegen/arrays/collectionGetMultiIndex.kt b/compiler/testData/codegen/box/arrays/collectionGetMultiIndex.kt similarity index 100% rename from compiler/testData/codegen/arrays/collectionGetMultiIndex.kt rename to compiler/testData/codegen/box/arrays/collectionGetMultiIndex.kt diff --git a/compiler/testData/codegen/arrays/forEachBooleanArray.kt b/compiler/testData/codegen/box/arrays/forEachBooleanArray.kt similarity index 100% rename from compiler/testData/codegen/arrays/forEachBooleanArray.kt rename to compiler/testData/codegen/box/arrays/forEachBooleanArray.kt diff --git a/compiler/testData/codegen/arrays/forEachByteArray.kt b/compiler/testData/codegen/box/arrays/forEachByteArray.kt similarity index 100% rename from compiler/testData/codegen/arrays/forEachByteArray.kt rename to compiler/testData/codegen/box/arrays/forEachByteArray.kt diff --git a/compiler/testData/codegen/arrays/forEachCharArray.kt b/compiler/testData/codegen/box/arrays/forEachCharArray.kt similarity index 100% rename from compiler/testData/codegen/arrays/forEachCharArray.kt rename to compiler/testData/codegen/box/arrays/forEachCharArray.kt diff --git a/compiler/testData/codegen/arrays/forEachDoubleArray.kt b/compiler/testData/codegen/box/arrays/forEachDoubleArray.kt similarity index 100% rename from compiler/testData/codegen/arrays/forEachDoubleArray.kt rename to compiler/testData/codegen/box/arrays/forEachDoubleArray.kt diff --git a/compiler/testData/codegen/arrays/forEachFloatArray.kt b/compiler/testData/codegen/box/arrays/forEachFloatArray.kt similarity index 100% rename from compiler/testData/codegen/arrays/forEachFloatArray.kt rename to compiler/testData/codegen/box/arrays/forEachFloatArray.kt diff --git a/compiler/testData/codegen/arrays/forEachIntArray.kt b/compiler/testData/codegen/box/arrays/forEachIntArray.kt similarity index 100% rename from compiler/testData/codegen/arrays/forEachIntArray.kt rename to compiler/testData/codegen/box/arrays/forEachIntArray.kt diff --git a/compiler/testData/codegen/arrays/forEachLongArray.kt b/compiler/testData/codegen/box/arrays/forEachLongArray.kt similarity index 100% rename from compiler/testData/codegen/arrays/forEachLongArray.kt rename to compiler/testData/codegen/box/arrays/forEachLongArray.kt diff --git a/compiler/testData/codegen/arrays/forEachShortArray.kt b/compiler/testData/codegen/box/arrays/forEachShortArray.kt similarity index 100% rename from compiler/testData/codegen/arrays/forEachShortArray.kt rename to compiler/testData/codegen/box/arrays/forEachShortArray.kt diff --git a/compiler/testData/codegen/arrays/hashMap.kt b/compiler/testData/codegen/box/arrays/hashMap.kt similarity index 100% rename from compiler/testData/codegen/arrays/hashMap.kt rename to compiler/testData/codegen/box/arrays/hashMap.kt diff --git a/compiler/testData/codegen/arrays/indices.kt b/compiler/testData/codegen/box/arrays/indices.kt similarity index 100% rename from compiler/testData/codegen/arrays/indices.kt rename to compiler/testData/codegen/box/arrays/indices.kt diff --git a/compiler/testData/codegen/arrays/indicesChar.kt b/compiler/testData/codegen/box/arrays/indicesChar.kt similarity index 100% rename from compiler/testData/codegen/arrays/indicesChar.kt rename to compiler/testData/codegen/box/arrays/indicesChar.kt diff --git a/compiler/testData/codegen/arrays/iterator.kt b/compiler/testData/codegen/box/arrays/iterator.kt similarity index 100% rename from compiler/testData/codegen/arrays/iterator.kt rename to compiler/testData/codegen/box/arrays/iterator.kt diff --git a/compiler/testData/codegen/arrays/iteratorBooleanArray.kt b/compiler/testData/codegen/box/arrays/iteratorBooleanArray.kt similarity index 100% rename from compiler/testData/codegen/arrays/iteratorBooleanArray.kt rename to compiler/testData/codegen/box/arrays/iteratorBooleanArray.kt diff --git a/compiler/testData/codegen/arrays/iteratorByteArray.kt b/compiler/testData/codegen/box/arrays/iteratorByteArray.kt similarity index 100% rename from compiler/testData/codegen/arrays/iteratorByteArray.kt rename to compiler/testData/codegen/box/arrays/iteratorByteArray.kt diff --git a/compiler/testData/codegen/arrays/iteratorByteArrayNextByte.kt b/compiler/testData/codegen/box/arrays/iteratorByteArrayNextByte.kt similarity index 100% rename from compiler/testData/codegen/arrays/iteratorByteArrayNextByte.kt rename to compiler/testData/codegen/box/arrays/iteratorByteArrayNextByte.kt diff --git a/compiler/testData/codegen/arrays/iteratorCharArray.kt b/compiler/testData/codegen/box/arrays/iteratorCharArray.kt similarity index 100% rename from compiler/testData/codegen/arrays/iteratorCharArray.kt rename to compiler/testData/codegen/box/arrays/iteratorCharArray.kt diff --git a/compiler/testData/codegen/arrays/iteratorDoubleArray.kt b/compiler/testData/codegen/box/arrays/iteratorDoubleArray.kt similarity index 100% rename from compiler/testData/codegen/arrays/iteratorDoubleArray.kt rename to compiler/testData/codegen/box/arrays/iteratorDoubleArray.kt diff --git a/compiler/testData/codegen/arrays/iteratorFloatArray.kt b/compiler/testData/codegen/box/arrays/iteratorFloatArray.kt similarity index 100% rename from compiler/testData/codegen/arrays/iteratorFloatArray.kt rename to compiler/testData/codegen/box/arrays/iteratorFloatArray.kt diff --git a/compiler/testData/codegen/arrays/iteratorIntArray.kt b/compiler/testData/codegen/box/arrays/iteratorIntArray.kt similarity index 100% rename from compiler/testData/codegen/arrays/iteratorIntArray.kt rename to compiler/testData/codegen/box/arrays/iteratorIntArray.kt diff --git a/compiler/testData/codegen/arrays/iteratorLongArray.kt b/compiler/testData/codegen/box/arrays/iteratorLongArray.kt similarity index 100% rename from compiler/testData/codegen/arrays/iteratorLongArray.kt rename to compiler/testData/codegen/box/arrays/iteratorLongArray.kt diff --git a/compiler/testData/codegen/arrays/iteratorLongArrayNextLong.kt b/compiler/testData/codegen/box/arrays/iteratorLongArrayNextLong.kt similarity index 100% rename from compiler/testData/codegen/arrays/iteratorLongArrayNextLong.kt rename to compiler/testData/codegen/box/arrays/iteratorLongArrayNextLong.kt diff --git a/compiler/testData/codegen/arrays/iteratorShortArray.kt b/compiler/testData/codegen/box/arrays/iteratorShortArray.kt similarity index 100% rename from compiler/testData/codegen/arrays/iteratorShortArray.kt rename to compiler/testData/codegen/box/arrays/iteratorShortArray.kt diff --git a/compiler/testData/codegen/regressions/kt238.kt b/compiler/testData/codegen/box/arrays/kt238.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt238.kt rename to compiler/testData/codegen/box/arrays/kt238.kt index 2d68811606e..96eaf8f43f5 100644 --- a/compiler/testData/codegen/regressions/kt238.kt +++ b/compiler/testData/codegen/box/arrays/kt238.kt @@ -55,4 +55,4 @@ class StrangeIntArray(size: Int) { fun set(index: Int, v: Int) { defaultValue = v } -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt2997.kt b/compiler/testData/codegen/box/arrays/kt2997.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2997.kt rename to compiler/testData/codegen/box/arrays/kt2997.kt diff --git a/compiler/testData/codegen/regressions/kt33.kt b/compiler/testData/codegen/box/arrays/kt33.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt33.kt rename to compiler/testData/codegen/box/arrays/kt33.kt index 59cf1415c72..8ae98aa541d 100644 --- a/compiler/testData/codegen/regressions/kt33.kt +++ b/compiler/testData/codegen/box/arrays/kt33.kt @@ -3,4 +3,4 @@ fun box () : String { s.add("foo") s[0] += "bar" return if(s[0] == "foobar") "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt503.kt b/compiler/testData/codegen/box/arrays/kt503.kt similarity index 95% rename from compiler/testData/codegen/regressions/kt503.kt rename to compiler/testData/codegen/box/arrays/kt503.kt index c1302d2011f..1dd71d3b6a9 100644 --- a/compiler/testData/codegen/regressions/kt503.kt +++ b/compiler/testData/codegen/box/arrays/kt503.kt @@ -29,4 +29,4 @@ fun box() : String { fun thirdElementIsThree(a : IntArray) = // Problematic code does not compile // a.size >= 3 & a[2] == 3 - a.size >= 3 && a[2] == 3 \ No newline at end of file + a.size >= 3 && a[2] == 3 diff --git a/compiler/testData/codegen/regressions/kt594.kt b/compiler/testData/codegen/box/arrays/kt594.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt594.kt rename to compiler/testData/codegen/box/arrays/kt594.kt index 2662b218785..c67bd1b66e7 100644 --- a/compiler/testData/codegen/regressions/kt594.kt +++ b/compiler/testData/codegen/box/arrays/kt594.kt @@ -13,4 +13,4 @@ fun box() : String { if(a?.get(0)?.get(0) != "239") return "fail" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt602.kt b/compiler/testData/codegen/box/arrays/kt602.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt602.kt rename to compiler/testData/codegen/box/arrays/kt602.kt diff --git a/compiler/testData/codegen/box/arrays/kt779.kt b/compiler/testData/codegen/box/arrays/kt779.kt new file mode 100644 index 00000000000..4e3a8073c2f --- /dev/null +++ b/compiler/testData/codegen/box/arrays/kt779.kt @@ -0,0 +1,3 @@ +val Array.length : Int get() = this.size + +fun box() = if(Array(10, {1}).length == 10) "OK" else "fail" diff --git a/compiler/testData/codegen/regressions/kt950.kt b/compiler/testData/codegen/box/arrays/kt950.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt950.kt rename to compiler/testData/codegen/box/arrays/kt950.kt diff --git a/compiler/testData/codegen/arrays/longAsIndex.kt b/compiler/testData/codegen/box/arrays/longAsIndex.kt similarity index 100% rename from compiler/testData/codegen/arrays/longAsIndex.kt rename to compiler/testData/codegen/box/arrays/longAsIndex.kt diff --git a/compiler/testData/codegen/arrays/nonNullArray.kt b/compiler/testData/codegen/box/arrays/nonNullArray.kt similarity index 100% rename from compiler/testData/codegen/arrays/nonNullArray.kt rename to compiler/testData/codegen/box/arrays/nonNullArray.kt diff --git a/compiler/testData/codegen/bridges/delegation.kt b/compiler/testData/codegen/box/bridges/delegation.kt similarity index 100% rename from compiler/testData/codegen/bridges/delegation.kt rename to compiler/testData/codegen/box/bridges/delegation.kt diff --git a/compiler/testData/codegen/bridges/delegationProperty.kt b/compiler/testData/codegen/box/bridges/delegationProperty.kt similarity index 100% rename from compiler/testData/codegen/bridges/delegationProperty.kt rename to compiler/testData/codegen/box/bridges/delegationProperty.kt diff --git a/compiler/testData/codegen/bridges/delegationToTraitImpl.kt b/compiler/testData/codegen/box/bridges/delegationToTraitImpl.kt similarity index 100% rename from compiler/testData/codegen/bridges/delegationToTraitImpl.kt rename to compiler/testData/codegen/box/bridges/delegationToTraitImpl.kt diff --git a/compiler/testData/codegen/bridges/diamond.kt b/compiler/testData/codegen/box/bridges/diamond.kt similarity index 100% rename from compiler/testData/codegen/bridges/diamond.kt rename to compiler/testData/codegen/box/bridges/diamond.kt diff --git a/compiler/testData/codegen/regressions/kt1939.kt b/compiler/testData/codegen/box/bridges/kt1939.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1939.kt rename to compiler/testData/codegen/box/bridges/kt1939.kt diff --git a/compiler/testData/codegen/regressions/kt1959.kt b/compiler/testData/codegen/box/bridges/kt1959.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1959.kt rename to compiler/testData/codegen/box/bridges/kt1959.kt diff --git a/compiler/testData/codegen/regressions/kt2498.kt b/compiler/testData/codegen/box/bridges/kt2498.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2498.kt rename to compiler/testData/codegen/box/bridges/kt2498.kt diff --git a/compiler/testData/codegen/regressions/kt2702.kt b/compiler/testData/codegen/box/bridges/kt2702.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2702.kt rename to compiler/testData/codegen/box/bridges/kt2702.kt diff --git a/compiler/testData/codegen/regressions/kt2833.kt b/compiler/testData/codegen/box/bridges/kt2833.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2833.kt rename to compiler/testData/codegen/box/bridges/kt2833.kt diff --git a/compiler/testData/codegen/regressions/kt2920.kt b/compiler/testData/codegen/box/bridges/kt2920.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2920.kt rename to compiler/testData/codegen/box/bridges/kt2920.kt diff --git a/compiler/testData/codegen/bridges/longChainOneBridge.kt b/compiler/testData/codegen/box/bridges/longChainOneBridge.kt similarity index 100% rename from compiler/testData/codegen/bridges/longChainOneBridge.kt rename to compiler/testData/codegen/box/bridges/longChainOneBridge.kt diff --git a/compiler/testData/codegen/bridges/manyTypeArgumentsSubstitutedSuccessively.kt b/compiler/testData/codegen/box/bridges/manyTypeArgumentsSubstitutedSuccessively.kt similarity index 100% rename from compiler/testData/codegen/bridges/manyTypeArgumentsSubstitutedSuccessively.kt rename to compiler/testData/codegen/box/bridges/manyTypeArgumentsSubstitutedSuccessively.kt diff --git a/compiler/testData/codegen/bridges/methodFromTrait.kt b/compiler/testData/codegen/box/bridges/methodFromTrait.kt similarity index 100% rename from compiler/testData/codegen/bridges/methodFromTrait.kt rename to compiler/testData/codegen/box/bridges/methodFromTrait.kt diff --git a/compiler/testData/codegen/bridges/overrideAbstractProperty.kt b/compiler/testData/codegen/box/bridges/overrideAbstractProperty.kt similarity index 100% rename from compiler/testData/codegen/bridges/overrideAbstractProperty.kt rename to compiler/testData/codegen/box/bridges/overrideAbstractProperty.kt diff --git a/compiler/testData/codegen/bridges/overrideReturnType.kt b/compiler/testData/codegen/box/bridges/overrideReturnType.kt similarity index 99% rename from compiler/testData/codegen/bridges/overrideReturnType.kt rename to compiler/testData/codegen/box/bridges/overrideReturnType.kt index f2d6eefa87f..e8d2619eb02 100644 --- a/compiler/testData/codegen/bridges/overrideReturnType.kt +++ b/compiler/testData/codegen/box/bridges/overrideReturnType.kt @@ -10,4 +10,4 @@ fun box(): String{ val d : C = D() if(d.f() != "D f") return "fail f" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/bridges/propertyAccessorsWithoutBody.kt b/compiler/testData/codegen/box/bridges/propertyAccessorsWithoutBody.kt similarity index 100% rename from compiler/testData/codegen/bridges/propertyAccessorsWithoutBody.kt rename to compiler/testData/codegen/box/bridges/propertyAccessorsWithoutBody.kt diff --git a/compiler/testData/codegen/bridges/propertyDiamond.kt b/compiler/testData/codegen/box/bridges/propertyDiamond.kt similarity index 100% rename from compiler/testData/codegen/bridges/propertyDiamond.kt rename to compiler/testData/codegen/box/bridges/propertyDiamond.kt diff --git a/compiler/testData/codegen/bridges/propertyInConstructor.kt b/compiler/testData/codegen/box/bridges/propertyInConstructor.kt similarity index 100% rename from compiler/testData/codegen/bridges/propertyInConstructor.kt rename to compiler/testData/codegen/box/bridges/propertyInConstructor.kt diff --git a/compiler/testData/codegen/bridges/propertySetter.kt b/compiler/testData/codegen/box/bridges/propertySetter.kt similarity index 100% rename from compiler/testData/codegen/bridges/propertySetter.kt rename to compiler/testData/codegen/box/bridges/propertySetter.kt diff --git a/compiler/testData/codegen/bridges/simple.kt b/compiler/testData/codegen/box/bridges/simple.kt similarity index 100% rename from compiler/testData/codegen/bridges/simple.kt rename to compiler/testData/codegen/box/bridges/simple.kt diff --git a/compiler/testData/codegen/bridges/simpleEnum.kt b/compiler/testData/codegen/box/bridges/simpleEnum.kt similarity index 100% rename from compiler/testData/codegen/bridges/simpleEnum.kt rename to compiler/testData/codegen/box/bridges/simpleEnum.kt diff --git a/compiler/testData/codegen/bridges/simpleGenericMethod.kt b/compiler/testData/codegen/box/bridges/simpleGenericMethod.kt similarity index 100% rename from compiler/testData/codegen/bridges/simpleGenericMethod.kt rename to compiler/testData/codegen/box/bridges/simpleGenericMethod.kt diff --git a/compiler/testData/codegen/bridges/simpleObject.kt b/compiler/testData/codegen/box/bridges/simpleObject.kt similarity index 100% rename from compiler/testData/codegen/bridges/simpleObject.kt rename to compiler/testData/codegen/box/bridges/simpleObject.kt diff --git a/compiler/testData/codegen/bridges/simpleReturnType.kt b/compiler/testData/codegen/box/bridges/simpleReturnType.kt similarity index 100% rename from compiler/testData/codegen/bridges/simpleReturnType.kt rename to compiler/testData/codegen/box/bridges/simpleReturnType.kt diff --git a/compiler/testData/codegen/bridges/simpleUpperBound.kt b/compiler/testData/codegen/box/bridges/simpleUpperBound.kt similarity index 100% rename from compiler/testData/codegen/bridges/simpleUpperBound.kt rename to compiler/testData/codegen/box/bridges/simpleUpperBound.kt diff --git a/compiler/testData/codegen/bridges/substitutionInSuperClass.kt b/compiler/testData/codegen/box/bridges/substitutionInSuperClass.kt similarity index 100% rename from compiler/testData/codegen/bridges/substitutionInSuperClass.kt rename to compiler/testData/codegen/box/bridges/substitutionInSuperClass.kt diff --git a/compiler/testData/codegen/bridges/substitutionInSuperClassAbstractFun.kt b/compiler/testData/codegen/box/bridges/substitutionInSuperClassAbstractFun.kt similarity index 100% rename from compiler/testData/codegen/bridges/substitutionInSuperClassAbstractFun.kt rename to compiler/testData/codegen/box/bridges/substitutionInSuperClassAbstractFun.kt diff --git a/compiler/testData/codegen/bridges/substitutionInSuperClassBoundedTypeArguments.kt b/compiler/testData/codegen/box/bridges/substitutionInSuperClassBoundedTypeArguments.kt similarity index 100% rename from compiler/testData/codegen/bridges/substitutionInSuperClassBoundedTypeArguments.kt rename to compiler/testData/codegen/box/bridges/substitutionInSuperClassBoundedTypeArguments.kt diff --git a/compiler/testData/codegen/bridges/substitutionInSuperClassDelegation.kt b/compiler/testData/codegen/box/bridges/substitutionInSuperClassDelegation.kt similarity index 100% rename from compiler/testData/codegen/bridges/substitutionInSuperClassDelegation.kt rename to compiler/testData/codegen/box/bridges/substitutionInSuperClassDelegation.kt diff --git a/compiler/testData/codegen/bridges/substitutionInSuperClassEnum.kt b/compiler/testData/codegen/box/bridges/substitutionInSuperClassEnum.kt similarity index 100% rename from compiler/testData/codegen/bridges/substitutionInSuperClassEnum.kt rename to compiler/testData/codegen/box/bridges/substitutionInSuperClassEnum.kt diff --git a/compiler/testData/codegen/bridges/substitutionInSuperClassGenericMethod.kt b/compiler/testData/codegen/box/bridges/substitutionInSuperClassGenericMethod.kt similarity index 100% rename from compiler/testData/codegen/bridges/substitutionInSuperClassGenericMethod.kt rename to compiler/testData/codegen/box/bridges/substitutionInSuperClassGenericMethod.kt diff --git a/compiler/testData/codegen/bridges/substitutionInSuperClassObject.kt b/compiler/testData/codegen/box/bridges/substitutionInSuperClassObject.kt similarity index 100% rename from compiler/testData/codegen/bridges/substitutionInSuperClassObject.kt rename to compiler/testData/codegen/box/bridges/substitutionInSuperClassObject.kt diff --git a/compiler/testData/codegen/bridges/substitutionInSuperClassProperty.kt b/compiler/testData/codegen/box/bridges/substitutionInSuperClassProperty.kt similarity index 100% rename from compiler/testData/codegen/bridges/substitutionInSuperClassProperty.kt rename to compiler/testData/codegen/box/bridges/substitutionInSuperClassProperty.kt diff --git a/compiler/testData/codegen/bridges/substitutionInSuperClassUpperBound.kt b/compiler/testData/codegen/box/bridges/substitutionInSuperClassUpperBound.kt similarity index 100% rename from compiler/testData/codegen/bridges/substitutionInSuperClassUpperBound.kt rename to compiler/testData/codegen/box/bridges/substitutionInSuperClassUpperBound.kt diff --git a/compiler/testData/codegen/bridges/twoParentsWithDifferentMethodsTwoBridges.kt b/compiler/testData/codegen/box/bridges/twoParentsWithDifferentMethodsTwoBridges.kt similarity index 100% rename from compiler/testData/codegen/bridges/twoParentsWithDifferentMethodsTwoBridges.kt rename to compiler/testData/codegen/box/bridges/twoParentsWithDifferentMethodsTwoBridges.kt diff --git a/compiler/testData/codegen/bridges/twoParentsWithTheSameMethodOneBridge.kt b/compiler/testData/codegen/box/bridges/twoParentsWithTheSameMethodOneBridge.kt similarity index 100% rename from compiler/testData/codegen/bridges/twoParentsWithTheSameMethodOneBridge.kt rename to compiler/testData/codegen/box/bridges/twoParentsWithTheSameMethodOneBridge.kt diff --git a/compiler/testData/codegen/classes/classObject.kt b/compiler/testData/codegen/box/classes/classObject.kt similarity index 100% rename from compiler/testData/codegen/classes/classObject.kt rename to compiler/testData/codegen/box/classes/classObject.kt diff --git a/compiler/testData/codegen/classes/classObjectField.kt b/compiler/testData/codegen/box/classes/classObjectField.kt similarity index 100% rename from compiler/testData/codegen/classes/classObjectField.kt rename to compiler/testData/codegen/box/classes/classObjectField.kt diff --git a/compiler/testData/codegen/classes/classObjectInTrait.kt b/compiler/testData/codegen/box/classes/classObjectInTrait.kt similarity index 100% rename from compiler/testData/codegen/classes/classObjectInTrait.kt rename to compiler/testData/codegen/box/classes/classObjectInTrait.kt diff --git a/compiler/testData/codegen/classes/delegation2.kt b/compiler/testData/codegen/box/classes/delegation2.kt similarity index 99% rename from compiler/testData/codegen/classes/delegation2.kt rename to compiler/testData/codegen/box/classes/delegation2.kt index 30a154ff2ec..83a4028d53e 100644 --- a/compiler/testData/codegen/classes/delegation2.kt +++ b/compiler/testData/codegen/box/classes/delegation2.kt @@ -21,4 +21,4 @@ fun box() : String { if(c.foo() != "aaa") return "fail" if(c.bar() != "bbb") return "fail" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/classes/delegation3.kt b/compiler/testData/codegen/box/classes/delegation3.kt similarity index 100% rename from compiler/testData/codegen/classes/delegation3.kt rename to compiler/testData/codegen/box/classes/delegation3.kt diff --git a/compiler/testData/codegen/classes/delegation4.kt b/compiler/testData/codegen/box/classes/delegation4.kt similarity index 99% rename from compiler/testData/codegen/classes/delegation4.kt rename to compiler/testData/codegen/box/classes/delegation4.kt index 9cf5f0eaf61..a37cb061d7c 100644 --- a/compiler/testData/codegen/classes/delegation4.kt +++ b/compiler/testData/codegen/box/classes/delegation4.kt @@ -25,4 +25,4 @@ fun box() : String { return "Fail #4" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/classes/delegationGenericArg.kt b/compiler/testData/codegen/box/classes/delegationGenericArg.kt similarity index 100% rename from compiler/testData/codegen/classes/delegationGenericArg.kt rename to compiler/testData/codegen/box/classes/delegationGenericArg.kt diff --git a/compiler/testData/codegen/classes/delegationGenericArgUpperBound.kt b/compiler/testData/codegen/box/classes/delegationGenericArgUpperBound.kt similarity index 100% rename from compiler/testData/codegen/classes/delegationGenericArgUpperBound.kt rename to compiler/testData/codegen/box/classes/delegationGenericArgUpperBound.kt diff --git a/compiler/testData/codegen/classes/delegationGenericLongArg.kt b/compiler/testData/codegen/box/classes/delegationGenericLongArg.kt similarity index 100% rename from compiler/testData/codegen/classes/delegationGenericLongArg.kt rename to compiler/testData/codegen/box/classes/delegationGenericLongArg.kt diff --git a/compiler/testData/codegen/classes/delegationJava.kt b/compiler/testData/codegen/box/classes/delegationJava.kt similarity index 100% rename from compiler/testData/codegen/classes/delegationJava.kt rename to compiler/testData/codegen/box/classes/delegationJava.kt diff --git a/compiler/testData/codegen/classes/delegationMethodsWithArgs.kt b/compiler/testData/codegen/box/classes/delegationMethodsWithArgs.kt similarity index 99% rename from compiler/testData/codegen/classes/delegationMethodsWithArgs.kt rename to compiler/testData/codegen/box/classes/delegationMethodsWithArgs.kt index d005b035d24..5e047aa7394 100644 --- a/compiler/testData/codegen/classes/delegationMethodsWithArgs.kt +++ b/compiler/testData/codegen/box/classes/delegationMethodsWithArgs.kt @@ -31,4 +31,4 @@ fun box() : String { if (textField.moo(1,2,3) != 6) return "FAIL #2" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/classes/diamondInheritance.kt b/compiler/testData/codegen/box/classes/diamondInheritance.kt similarity index 99% rename from compiler/testData/codegen/classes/diamondInheritance.kt rename to compiler/testData/codegen/box/classes/diamondInheritance.kt index 210aecafedc..447036bf49b 100644 --- a/compiler/testData/codegen/classes/diamondInheritance.kt +++ b/compiler/testData/codegen/box/classes/diamondInheritance.kt @@ -21,4 +21,4 @@ fun box() : String { if (vr(d) != 42) return "Fail #3" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/classes/exceptionConstructor.kt b/compiler/testData/codegen/box/classes/exceptionConstructor.kt similarity index 100% rename from compiler/testData/codegen/classes/exceptionConstructor.kt rename to compiler/testData/codegen/box/classes/exceptionConstructor.kt diff --git a/compiler/testData/codegen/classes/funDelegation.kt b/compiler/testData/codegen/box/classes/funDelegation.kt similarity index 99% rename from compiler/testData/codegen/classes/funDelegation.kt rename to compiler/testData/codegen/box/classes/funDelegation.kt index 10a1f408b09..f940e8e16c9 100644 --- a/compiler/testData/codegen/classes/funDelegation.kt +++ b/compiler/testData/codegen/box/classes/funDelegation.kt @@ -14,4 +14,4 @@ fun box() : String { if (!test(Derived1())) return "Fail #2" if (!test(Derived2())) return "Fail #3" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/classes/inheritance.kt b/compiler/testData/codegen/box/classes/inheritance.kt similarity index 99% rename from compiler/testData/codegen/classes/inheritance.kt rename to compiler/testData/codegen/box/classes/inheritance.kt index 0bfdb4e497f..1b919497b5c 100644 --- a/compiler/testData/codegen/classes/inheritance.kt +++ b/compiler/testData/codegen/box/classes/inheritance.kt @@ -38,4 +38,4 @@ fun box() : String { if (p4.x + p4.y != 239) return "FAIL #7" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/classes/inheritedInnerClass.kt b/compiler/testData/codegen/box/classes/inheritedInnerClass.kt similarity index 100% rename from compiler/testData/codegen/classes/inheritedInnerClass.kt rename to compiler/testData/codegen/box/classes/inheritedInnerClass.kt diff --git a/compiler/testData/codegen/classes/inheritedMethod.kt b/compiler/testData/codegen/box/classes/inheritedMethod.kt similarity index 100% rename from compiler/testData/codegen/classes/inheritedMethod.kt rename to compiler/testData/codegen/box/classes/inheritedMethod.kt diff --git a/compiler/testData/codegen/classes/initializerBlock.kt b/compiler/testData/codegen/box/classes/initializerBlock.kt similarity index 100% rename from compiler/testData/codegen/classes/initializerBlock.kt rename to compiler/testData/codegen/box/classes/initializerBlock.kt diff --git a/compiler/testData/codegen/classes/initializerBlockDImpl.kt b/compiler/testData/codegen/box/classes/initializerBlockDImpl.kt similarity index 100% rename from compiler/testData/codegen/classes/initializerBlockDImpl.kt rename to compiler/testData/codegen/box/classes/initializerBlockDImpl.kt diff --git a/compiler/testData/codegen/classes/innerClass.kt b/compiler/testData/codegen/box/classes/innerClass.kt similarity index 100% rename from compiler/testData/codegen/classes/innerClass.kt rename to compiler/testData/codegen/box/classes/innerClass.kt diff --git a/compiler/testData/codegen/regressions/kt1018.kt b/compiler/testData/codegen/box/classes/kt1018.kt similarity index 92% rename from compiler/testData/codegen/regressions/kt1018.kt rename to compiler/testData/codegen/box/classes/kt1018.kt index 68f6c20e5c6..a671fe4f9ac 100644 --- a/compiler/testData/codegen/regressions/kt1018.kt +++ b/compiler/testData/codegen/box/classes/kt1018.kt @@ -9,4 +9,4 @@ public class StockMarketTableModel() { } } -fun box() : String = if(StockMarketTableModel().getColumnCount()==10) "OK" else "fail" \ No newline at end of file +fun box() : String = if(StockMarketTableModel().getColumnCount()==10) "OK" else "fail" diff --git a/compiler/testData/codegen/regressions/kt1120.kt b/compiler/testData/codegen/box/classes/kt1120.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1120.kt rename to compiler/testData/codegen/box/classes/kt1120.kt diff --git a/compiler/testData/codegen/regressions/kt1134.kt b/compiler/testData/codegen/box/classes/kt1134.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt1134.kt rename to compiler/testData/codegen/box/classes/kt1134.kt index c1908109bce..b2fd2dc4022 100644 --- a/compiler/testData/codegen/regressions/kt1134.kt +++ b/compiler/testData/codegen/box/classes/kt1134.kt @@ -4,4 +4,4 @@ public class SomeClass() : java.lang.Object() { public fun box():String { System.out?.println(SomeClass().getClass()) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1157.kt b/compiler/testData/codegen/box/classes/kt1157.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt1157.kt rename to compiler/testData/codegen/box/classes/kt1157.kt index a053a0e54cd..0847651ea56 100644 --- a/compiler/testData/codegen/regressions/kt1157.kt +++ b/compiler/testData/codegen/box/classes/kt1157.kt @@ -25,4 +25,4 @@ public fun box():String { if(SomeClass.bug is Throwable) throw SomeClass.bug as Throwable return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1247.kt b/compiler/testData/codegen/box/classes/kt1247.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1247.kt rename to compiler/testData/codegen/box/classes/kt1247.kt diff --git a/compiler/testData/codegen/regressions/kt1345.kt b/compiler/testData/codegen/box/classes/kt1345.kt similarity index 80% rename from compiler/testData/codegen/regressions/kt1345.kt rename to compiler/testData/codegen/box/classes/kt1345.kt index 1888fa33dd8..28d9467076a 100644 --- a/compiler/testData/codegen/regressions/kt1345.kt +++ b/compiler/testData/codegen/box/classes/kt1345.kt @@ -10,4 +10,4 @@ class MyFactory() : Factory { override fun create(): Actor = Actor() } -fun box() : String = MyFactory().create().code \ No newline at end of file +fun box() : String = MyFactory().create().code diff --git a/compiler/testData/codegen/regressions/kt1439.kt b/compiler/testData/codegen/box/classes/kt1439.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1439.kt rename to compiler/testData/codegen/box/classes/kt1439.kt diff --git a/compiler/testData/codegen/regressions/kt1535.kt b/compiler/testData/codegen/box/classes/kt1535.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1535.kt rename to compiler/testData/codegen/box/classes/kt1535.kt diff --git a/compiler/testData/codegen/regressions/kt1538.kt b/compiler/testData/codegen/box/classes/kt1538.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt1538.kt rename to compiler/testData/codegen/box/classes/kt1538.kt index a475b947580..0e458c69c27 100644 --- a/compiler/testData/codegen/regressions/kt1538.kt +++ b/compiler/testData/codegen/box/classes/kt1538.kt @@ -20,4 +20,4 @@ fun toHasMap(value: Any?): Pair?> { fun box() : String { parseCatalogs(null) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1578.kt b/compiler/testData/codegen/box/classes/kt1578.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1578.kt rename to compiler/testData/codegen/box/classes/kt1578.kt diff --git a/compiler/testData/codegen/regressions/kt1611.kt b/compiler/testData/codegen/box/classes/kt1611.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt1611.kt rename to compiler/testData/codegen/box/classes/kt1611.kt index 3868730d889..b04a15ef70e 100644 --- a/compiler/testData/codegen/regressions/kt1611.kt +++ b/compiler/testData/codegen/box/classes/kt1611.kt @@ -8,4 +8,4 @@ class Foo() { fun doBar(str : String): String { return bar(str); } -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1721.kt b/compiler/testData/codegen/box/classes/kt1721.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1721.kt rename to compiler/testData/codegen/box/classes/kt1721.kt diff --git a/compiler/testData/codegen/regressions/kt1726.kt b/compiler/testData/codegen/box/classes/kt1726.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1726.kt rename to compiler/testData/codegen/box/classes/kt1726.kt diff --git a/compiler/testData/codegen/regressions/kt1759.kt b/compiler/testData/codegen/box/classes/kt1759.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt1759.kt rename to compiler/testData/codegen/box/classes/kt1759.kt index c4027f8970b..d9f20bb471e 100644 --- a/compiler/testData/codegen/regressions/kt1759.kt +++ b/compiler/testData/codegen/box/classes/kt1759.kt @@ -8,4 +8,4 @@ class Greeter(var name : String) { fun box() : String { Greeter("OK").greet() return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1891.kt b/compiler/testData/codegen/box/classes/kt1891.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1891.kt rename to compiler/testData/codegen/box/classes/kt1891.kt diff --git a/compiler/testData/codegen/regressions/kt1918.kt b/compiler/testData/codegen/box/classes/kt1918.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1918.kt rename to compiler/testData/codegen/box/classes/kt1918.kt diff --git a/compiler/testData/codegen/regressions/kt1976.kt b/compiler/testData/codegen/box/classes/kt1976.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1976.kt rename to compiler/testData/codegen/box/classes/kt1976.kt diff --git a/compiler/testData/codegen/regressions/kt1980.kt b/compiler/testData/codegen/box/classes/kt1980.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1980.kt rename to compiler/testData/codegen/box/classes/kt1980.kt diff --git a/compiler/testData/codegen/regressions/kt2224.kt b/compiler/testData/codegen/box/classes/kt2224.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2224.kt rename to compiler/testData/codegen/box/classes/kt2224.kt diff --git a/compiler/testData/codegen/regressions/kt2288.kt b/compiler/testData/codegen/box/classes/kt2288.kt similarity index 86% rename from compiler/testData/codegen/regressions/kt2288.kt rename to compiler/testData/codegen/box/classes/kt2288.kt index ce888361fb9..5aa04a53b0a 100644 --- a/compiler/testData/codegen/regressions/kt2288.kt +++ b/compiler/testData/codegen/box/classes/kt2288.kt @@ -5,4 +5,4 @@ public open class Test(): java.util.RandomAccess, Cloneable, java.io.Serializabl public override fun toString() = "OK" } -fun box() = Test().clone().toString() \ No newline at end of file +fun box() = Test().clone().toString() diff --git a/compiler/testData/codegen/regressions/kt2384.kt b/compiler/testData/codegen/box/classes/kt2384.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2384.kt rename to compiler/testData/codegen/box/classes/kt2384.kt diff --git a/compiler/testData/codegen/regressions/kt2390.kt b/compiler/testData/codegen/box/classes/kt2390.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2390.kt rename to compiler/testData/codegen/box/classes/kt2390.kt diff --git a/compiler/testData/codegen/regressions/kt2391.kt b/compiler/testData/codegen/box/classes/kt2391.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2391.kt rename to compiler/testData/codegen/box/classes/kt2391.kt diff --git a/compiler/testData/codegen/regressions/kt2395.kt b/compiler/testData/codegen/box/classes/kt2395.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2395.kt rename to compiler/testData/codegen/box/classes/kt2395.kt diff --git a/compiler/testData/codegen/regressions/kt2417.kt b/compiler/testData/codegen/box/classes/kt2417.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt2417.kt rename to compiler/testData/codegen/box/classes/kt2417.kt index 42214b38016..bf1fa375e2c 100644 --- a/compiler/testData/codegen/regressions/kt2417.kt +++ b/compiler/testData/codegen/box/classes/kt2417.kt @@ -22,4 +22,4 @@ fun box() : String{ } if(t6) return "fail6" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt2477.kt b/compiler/testData/codegen/box/classes/kt2477.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt2477.kt rename to compiler/testData/codegen/box/classes/kt2477.kt index 0c6b5fb7fb8..a18e8731ab6 100644 --- a/compiler/testData/codegen/regressions/kt2477.kt +++ b/compiler/testData/codegen/box/classes/kt2477.kt @@ -19,4 +19,4 @@ open class D: C(), A, B { fun box() : String { return D().c -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt2480.kt b/compiler/testData/codegen/box/classes/kt2480.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt2480.kt rename to compiler/testData/codegen/box/classes/kt2480.kt index fececbc3e78..cbeec9ce597 100644 --- a/compiler/testData/codegen/regressions/kt2480.kt +++ b/compiler/testData/codegen/box/classes/kt2480.kt @@ -10,4 +10,4 @@ public class Class: AbstractClass() { public override val some: String get() = "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt2482.kt b/compiler/testData/codegen/box/classes/kt2482.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt2482.kt rename to compiler/testData/codegen/box/classes/kt2482.kt index c9c6d6e7692..6a614198741 100644 --- a/compiler/testData/codegen/regressions/kt2482.kt +++ b/compiler/testData/codegen/box/classes/kt2482.kt @@ -6,4 +6,4 @@ public fun box() : String { } } return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt2485.kt b/compiler/testData/codegen/box/classes/kt2485.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt2485.kt rename to compiler/testData/codegen/box/classes/kt2485.kt index 2f9a65dbdb1..5ef24c24577 100644 --- a/compiler/testData/codegen/regressions/kt2485.kt +++ b/compiler/testData/codegen/box/classes/kt2485.kt @@ -9,4 +9,4 @@ fun box() : String { f3(1 == 1) f4(1 == 1) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt249.kt b/compiler/testData/codegen/box/classes/kt249.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt249.kt rename to compiler/testData/codegen/box/classes/kt249.kt diff --git a/compiler/testData/codegen/classes/kt2532.kt b/compiler/testData/codegen/box/classes/kt2532.kt similarity index 99% rename from compiler/testData/codegen/classes/kt2532.kt rename to compiler/testData/codegen/box/classes/kt2532.kt index a1f3eb7edf5..a3a0a4a0d35 100644 --- a/compiler/testData/codegen/classes/kt2532.kt +++ b/compiler/testData/codegen/box/classes/kt2532.kt @@ -12,4 +12,4 @@ class A(val b: B) : B by b { fun box(): String { val c = A(object: B {}).c return if (c == 3) "OK" else "fail: $c" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt2566.kt b/compiler/testData/codegen/box/classes/kt2566.kt similarity index 88% rename from compiler/testData/codegen/regressions/kt2566.kt rename to compiler/testData/codegen/box/classes/kt2566.kt index 98e164f0716..fff411738e8 100644 --- a/compiler/testData/codegen/regressions/kt2566.kt +++ b/compiler/testData/codegen/box/classes/kt2566.kt @@ -12,4 +12,4 @@ class C : I, B() { override fun foo() = super.foo() } -fun box() = C().foo() \ No newline at end of file +fun box() = C().foo() diff --git a/compiler/testData/codegen/regressions/kt2566_2.kt b/compiler/testData/codegen/box/classes/kt2566_2.kt similarity index 91% rename from compiler/testData/codegen/regressions/kt2566_2.kt rename to compiler/testData/codegen/box/classes/kt2566_2.kt index 678109cea3f..b119af85615 100644 --- a/compiler/testData/codegen/regressions/kt2566_2.kt +++ b/compiler/testData/codegen/box/classes/kt2566_2.kt @@ -14,4 +14,4 @@ class C : B() { } } -fun box() = C().foo \ No newline at end of file +fun box() = C().foo diff --git a/compiler/testData/codegen/regressions/kt2607.kt b/compiler/testData/codegen/box/classes/kt2607.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt2607.kt rename to compiler/testData/codegen/box/classes/kt2607.kt index 85cf6e66d2e..10688476918 100644 --- a/compiler/testData/codegen/regressions/kt2607.kt +++ b/compiler/testData/codegen/box/classes/kt2607.kt @@ -6,4 +6,4 @@ fun box() : String { } } return o.C().foo() -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt2626.kt b/compiler/testData/codegen/box/classes/kt2626.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt2626.kt rename to compiler/testData/codegen/box/classes/kt2626.kt index 284686d9fb8..e01febbd377 100644 --- a/compiler/testData/codegen/regressions/kt2626.kt +++ b/compiler/testData/codegen/box/classes/kt2626.kt @@ -7,4 +7,4 @@ object Context public enum class OsType { WIN2000; WINDOWS; MACOSX; LINUX; OTHER; OK } -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt2711.kt b/compiler/testData/codegen/box/classes/kt2711.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2711.kt rename to compiler/testData/codegen/box/classes/kt2711.kt diff --git a/compiler/testData/codegen/regressions/kt285.kt b/compiler/testData/codegen/box/classes/kt285.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt285.kt rename to compiler/testData/codegen/box/classes/kt285.kt diff --git a/compiler/testData/codegen/regressions/kt343.kt b/compiler/testData/codegen/box/classes/kt343.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt343.kt rename to compiler/testData/codegen/box/classes/kt343.kt index 1820bbe0ffb..9f04f884f7c 100644 --- a/compiler/testData/codegen/regressions/kt343.kt +++ b/compiler/testData/codegen/box/classes/kt343.kt @@ -21,4 +21,4 @@ fun box(): String { bar() return if (list.size() == 2 && list.get(0) == 2 && list.get(1) == 3) "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt454.kt b/compiler/testData/codegen/box/classes/kt454.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt454.kt rename to compiler/testData/codegen/box/classes/kt454.kt index 602643ce076..7bf4908df23 100644 --- a/compiler/testData/codegen/regressions/kt454.kt +++ b/compiler/testData/codegen/box/classes/kt454.kt @@ -2,4 +2,4 @@ fun box(): String { var s1 = (@l1 "s") val s2 = (@l2 if (@l3 true) s1 else null) return if (s2 == "s") "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt471.kt b/compiler/testData/codegen/box/classes/kt471.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt471.kt rename to compiler/testData/codegen/box/classes/kt471.kt diff --git a/compiler/testData/codegen/regressions/kt48.kt b/compiler/testData/codegen/box/classes/kt48.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt48.kt rename to compiler/testData/codegen/box/classes/kt48.kt index 1f1eba124d8..007c5958af0 100644 --- a/compiler/testData/codegen/regressions/kt48.kt +++ b/compiler/testData/codegen/box/classes/kt48.kt @@ -26,4 +26,4 @@ class A() { fun box() : String { return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt496.kt b/compiler/testData/codegen/box/classes/kt496.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt496.kt rename to compiler/testData/codegen/box/classes/kt496.kt diff --git a/compiler/testData/codegen/regressions/kt500.kt b/compiler/testData/codegen/box/classes/kt500.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt500.kt rename to compiler/testData/codegen/box/classes/kt500.kt diff --git a/compiler/testData/codegen/regressions/kt501.kt b/compiler/testData/codegen/box/classes/kt501.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt501.kt rename to compiler/testData/codegen/box/classes/kt501.kt diff --git a/compiler/testData/codegen/regressions/kt504.kt b/compiler/testData/codegen/box/classes/kt504.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt504.kt rename to compiler/testData/codegen/box/classes/kt504.kt diff --git a/compiler/testData/codegen/regressions/kt508.kt b/compiler/testData/codegen/box/classes/kt508.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt508.kt rename to compiler/testData/codegen/box/classes/kt508.kt diff --git a/compiler/testData/codegen/regressions/kt633.kt b/compiler/testData/codegen/box/classes/kt633.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt633.kt rename to compiler/testData/codegen/box/classes/kt633.kt index 13a8caceb03..fdcd66d7543 100644 --- a/compiler/testData/codegen/regressions/kt633.kt +++ b/compiler/testData/codegen/box/classes/kt633.kt @@ -23,4 +23,4 @@ fun box() : String { for (i in 0..9) System.out?.println("ar: ${a[mInt(i)]}") return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt707.kt b/compiler/testData/codegen/box/classes/kt707.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt707.kt rename to compiler/testData/codegen/box/classes/kt707.kt index a12afa2b3cd..ce90660a3a8 100644 --- a/compiler/testData/codegen/regressions/kt707.kt +++ b/compiler/testData/codegen/box/classes/kt707.kt @@ -6,4 +6,4 @@ fun box() : String { val a: Int = List(1).mapHead{it * 2}.head System.out?.println(a) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt723.kt b/compiler/testData/codegen/box/classes/kt723.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt723.kt rename to compiler/testData/codegen/box/classes/kt723.kt index 991d6b2772d..10198d070bf 100644 --- a/compiler/testData/codegen/regressions/kt723.kt +++ b/compiler/testData/codegen/box/classes/kt723.kt @@ -5,4 +5,4 @@ public fun box() : String { val j = i++ return if(j==10 && 11 == i) "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt725.kt b/compiler/testData/codegen/box/classes/kt725.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt725.kt rename to compiler/testData/codegen/box/classes/kt725.kt index 7ab562ae773..3a0bc425693 100644 --- a/compiler/testData/codegen/regressions/kt725.kt +++ b/compiler/testData/codegen/box/classes/kt725.kt @@ -5,4 +5,4 @@ public fun box() : String { val j = i++ return if(j==10 && 11 == i) "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt903.kt b/compiler/testData/codegen/box/classes/kt903.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt903.kt rename to compiler/testData/codegen/box/classes/kt903.kt index d229c0724d8..e80afe38dca 100644 --- a/compiler/testData/codegen/regressions/kt903.kt +++ b/compiler/testData/codegen/box/classes/kt903.kt @@ -22,4 +22,4 @@ public open class PerfectNumberFinder() { } } -fun box () = if (PerfectNumberFinder().isPerfect(28)) "OK" else "fail" \ No newline at end of file +fun box () = if (PerfectNumberFinder().isPerfect(28)) "OK" else "fail" diff --git a/compiler/testData/codegen/regressions/kt940.kt b/compiler/testData/codegen/box/classes/kt940.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt940.kt rename to compiler/testData/codegen/box/classes/kt940.kt diff --git a/compiler/testData/codegen/classes/outerThis.kt b/compiler/testData/codegen/box/classes/outerThis.kt similarity index 100% rename from compiler/testData/codegen/classes/outerThis.kt rename to compiler/testData/codegen/box/classes/outerThis.kt diff --git a/compiler/testData/codegen/classes/overloadBinaryOperator.kt b/compiler/testData/codegen/box/classes/overloadBinaryOperator.kt similarity index 100% rename from compiler/testData/codegen/classes/overloadBinaryOperator.kt rename to compiler/testData/codegen/box/classes/overloadBinaryOperator.kt diff --git a/compiler/testData/codegen/classes/overloadPlusAssign.kt b/compiler/testData/codegen/box/classes/overloadPlusAssign.kt similarity index 100% rename from compiler/testData/codegen/classes/overloadPlusAssign.kt rename to compiler/testData/codegen/box/classes/overloadPlusAssign.kt diff --git a/compiler/testData/codegen/classes/overloadPlusAssignReturn.kt b/compiler/testData/codegen/box/classes/overloadPlusAssignReturn.kt similarity index 100% rename from compiler/testData/codegen/classes/overloadPlusAssignReturn.kt rename to compiler/testData/codegen/box/classes/overloadPlusAssignReturn.kt diff --git a/compiler/testData/codegen/classes/overloadPlusToPlusAssign.kt b/compiler/testData/codegen/box/classes/overloadPlusToPlusAssign.kt similarity index 100% rename from compiler/testData/codegen/classes/overloadPlusToPlusAssign.kt rename to compiler/testData/codegen/box/classes/overloadPlusToPlusAssign.kt diff --git a/compiler/testData/codegen/classes/overloadUnaryOperator.kt b/compiler/testData/codegen/box/classes/overloadUnaryOperator.kt similarity index 100% rename from compiler/testData/codegen/classes/overloadUnaryOperator.kt rename to compiler/testData/codegen/box/classes/overloadUnaryOperator.kt diff --git a/compiler/testData/codegen/classes/privateOuterFunctions.kt b/compiler/testData/codegen/box/classes/privateOuterFunctions.kt similarity index 95% rename from compiler/testData/codegen/classes/privateOuterFunctions.kt rename to compiler/testData/codegen/box/classes/privateOuterFunctions.kt index e8f13cf7de9..d65a5a112e8 100644 --- a/compiler/testData/codegen/classes/privateOuterFunctions.kt +++ b/compiler/testData/codegen/box/classes/privateOuterFunctions.kt @@ -28,4 +28,4 @@ class C { } } -fun box() = C().foo() \ No newline at end of file +fun box() = C().foo() diff --git a/compiler/testData/codegen/classes/privateOuterProperty.kt b/compiler/testData/codegen/box/classes/privateOuterProperty.kt similarity index 88% rename from compiler/testData/codegen/classes/privateOuterProperty.kt rename to compiler/testData/codegen/box/classes/privateOuterProperty.kt index 8b972461cec..9596e1cb5b2 100644 --- a/compiler/testData/codegen/classes/privateOuterProperty.kt +++ b/compiler/testData/codegen/box/classes/privateOuterProperty.kt @@ -24,4 +24,4 @@ class C{ } } -fun box() = if (C().foo() == 3) "OK" else "NOT OK" \ No newline at end of file +fun box() = if (C().foo() == 3) "OK" else "NOT OK" diff --git a/compiler/testData/codegen/classes/propertyDelegation.kt b/compiler/testData/codegen/box/classes/propertyDelegation.kt similarity index 99% rename from compiler/testData/codegen/classes/propertyDelegation.kt rename to compiler/testData/codegen/box/classes/propertyDelegation.kt index 614c624f124..fcf720a21ba 100644 --- a/compiler/testData/codegen/classes/propertyDelegation.kt +++ b/compiler/testData/codegen/box/classes/propertyDelegation.kt @@ -30,4 +30,4 @@ fun box() : String { if (!test(Derived1())) return "Fail #2" if (!test(Derived2())) return "Fail #3" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/classes/propertyInInitializer.kt b/compiler/testData/codegen/box/classes/propertyInInitializer.kt similarity index 100% rename from compiler/testData/codegen/classes/propertyInInitializer.kt rename to compiler/testData/codegen/box/classes/propertyInInitializer.kt diff --git a/compiler/testData/codegen/classes/resolveOrder.kt b/compiler/testData/codegen/box/classes/resolveOrder.kt similarity index 100% rename from compiler/testData/codegen/classes/resolveOrder.kt rename to compiler/testData/codegen/box/classes/resolveOrder.kt diff --git a/compiler/testData/codegen/classes/rightHandOverride.kt b/compiler/testData/codegen/box/classes/rightHandOverride.kt similarity index 99% rename from compiler/testData/codegen/classes/rightHandOverride.kt rename to compiler/testData/codegen/box/classes/rightHandOverride.kt index e99e60bd863..987da6bd6b0 100644 --- a/compiler/testData/codegen/classes/rightHandOverride.kt +++ b/compiler/testData/codegen/box/classes/rightHandOverride.kt @@ -17,4 +17,4 @@ fun box() : String { if (d.f() != 239) return "Fail #2" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/classes/selfcreate.kt b/compiler/testData/codegen/box/classes/selfcreate.kt similarity index 98% rename from compiler/testData/codegen/classes/selfcreate.kt rename to compiler/testData/codegen/box/classes/selfcreate.kt index 62be018cf32..1c78c067719 100644 --- a/compiler/testData/codegen/classes/selfcreate.kt +++ b/compiler/testData/codegen/box/classes/selfcreate.kt @@ -7,4 +7,4 @@ open class A(val b : B) { fun box() : String { A(B()).a() return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/classes/simpleBox.kt b/compiler/testData/codegen/box/classes/simpleBox.kt similarity index 100% rename from compiler/testData/codegen/classes/simpleBox.kt rename to compiler/testData/codegen/box/classes/simpleBox.kt diff --git a/compiler/testData/codegen/classes/typedDelegation.kt b/compiler/testData/codegen/box/classes/typedDelegation.kt similarity index 99% rename from compiler/testData/codegen/classes/typedDelegation.kt rename to compiler/testData/codegen/box/classes/typedDelegation.kt index df4867e1320..0ffd3265146 100644 --- a/compiler/testData/codegen/classes/typedDelegation.kt +++ b/compiler/testData/codegen/box/classes/typedDelegation.kt @@ -28,4 +28,4 @@ fun box() : String { } return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/classes/closureWithParameter.kt b/compiler/testData/codegen/box/closures/closureWithParameter.kt similarity index 100% rename from compiler/testData/codegen/classes/closureWithParameter.kt rename to compiler/testData/codegen/box/closures/closureWithParameter.kt diff --git a/compiler/testData/codegen/classes/closureWithParameterAndBoxing.kt b/compiler/testData/codegen/box/closures/closureWithParameterAndBoxing.kt similarity index 100% rename from compiler/testData/codegen/classes/closureWithParameterAndBoxing.kt rename to compiler/testData/codegen/box/closures/closureWithParameterAndBoxing.kt diff --git a/compiler/testData/codegen/classes/doubleEnclosedLocalVariable.kt b/compiler/testData/codegen/box/closures/doubleEnclosedLocalVariable.kt similarity index 100% rename from compiler/testData/codegen/classes/doubleEnclosedLocalVariable.kt rename to compiler/testData/codegen/box/closures/doubleEnclosedLocalVariable.kt diff --git a/compiler/testData/codegen/classes/enclosingLocalVariable.kt b/compiler/testData/codegen/box/closures/enclosingLocalVariable.kt similarity index 100% rename from compiler/testData/codegen/classes/enclosingLocalVariable.kt rename to compiler/testData/codegen/box/closures/enclosingLocalVariable.kt diff --git a/compiler/testData/codegen/classes/enclosingThis.kt b/compiler/testData/codegen/box/closures/enclosingThis.kt similarity index 100% rename from compiler/testData/codegen/classes/enclosingThis.kt rename to compiler/testData/codegen/box/closures/enclosingThis.kt diff --git a/compiler/testData/codegen/classes/extensionClosure.kt b/compiler/testData/codegen/box/closures/extensionClosure.kt similarity index 100% rename from compiler/testData/codegen/classes/extensionClosure.kt rename to compiler/testData/codegen/box/closures/extensionClosure.kt diff --git a/compiler/testData/codegen/regressions/kt2151.kt b/compiler/testData/codegen/box/closures/kt2151.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2151.kt rename to compiler/testData/codegen/box/closures/kt2151.kt diff --git a/compiler/testData/codegen/classes/recursiveClosure.kt b/compiler/testData/codegen/box/closures/recursiveClosure.kt similarity index 100% rename from compiler/testData/codegen/classes/recursiveClosure.kt rename to compiler/testData/codegen/box/closures/recursiveClosure.kt diff --git a/compiler/testData/codegen/classes/simplestClosure.kt b/compiler/testData/codegen/box/closures/simplestClosure.kt similarity index 100% rename from compiler/testData/codegen/classes/simplestClosure.kt rename to compiler/testData/codegen/box/closures/simplestClosure.kt diff --git a/compiler/testData/codegen/classes/simplestClosureAndBoxing.kt b/compiler/testData/codegen/box/closures/simplestClosureAndBoxing.kt similarity index 100% rename from compiler/testData/codegen/classes/simplestClosureAndBoxing.kt rename to compiler/testData/codegen/box/closures/simplestClosureAndBoxing.kt diff --git a/compiler/testData/codegen/controlStructures/compareBoxedIntegerToZero.kt b/compiler/testData/codegen/box/controlStructures/compareBoxedIntegerToZero.kt similarity index 100% rename from compiler/testData/codegen/controlStructures/compareBoxedIntegerToZero.kt rename to compiler/testData/codegen/box/controlStructures/compareBoxedIntegerToZero.kt diff --git a/compiler/testData/codegen/controlStructures/conditionOfEmptyIf.kt b/compiler/testData/codegen/box/controlStructures/conditionOfEmptyIf.kt similarity index 100% rename from compiler/testData/codegen/controlStructures/conditionOfEmptyIf.kt rename to compiler/testData/codegen/box/controlStructures/conditionOfEmptyIf.kt diff --git a/compiler/testData/codegen/controlStructures/continueInFor.kt b/compiler/testData/codegen/box/controlStructures/continueInFor.kt similarity index 99% rename from compiler/testData/codegen/controlStructures/continueInFor.kt rename to compiler/testData/codegen/box/controlStructures/continueInFor.kt index b4e1734aa74..733503c4397 100644 --- a/compiler/testData/codegen/controlStructures/continueInFor.kt +++ b/compiler/testData/codegen/box/controlStructures/continueInFor.kt @@ -120,4 +120,4 @@ fun box(): String { if (for_long_list() != 5) return "fail 8" if (for_double_list() != 5) return "fail 9" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/controlStructures/continueToLabelInFor.kt b/compiler/testData/codegen/box/controlStructures/continueToLabelInFor.kt similarity index 99% rename from compiler/testData/codegen/controlStructures/continueToLabelInFor.kt rename to compiler/testData/codegen/box/controlStructures/continueToLabelInFor.kt index b3b57f1d739..908afa088ca 100644 --- a/compiler/testData/codegen/controlStructures/continueToLabelInFor.kt +++ b/compiler/testData/codegen/box/controlStructures/continueToLabelInFor.kt @@ -120,4 +120,4 @@ fun box(): String { if (for_long_list() != 5) return "fail 8" if (for_double_list() != 5) return "fail 9" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/controlStructures/finallyOnEmptyReturn.kt b/compiler/testData/codegen/box/controlStructures/finallyOnEmptyReturn.kt similarity index 100% rename from compiler/testData/codegen/controlStructures/finallyOnEmptyReturn.kt rename to compiler/testData/codegen/box/controlStructures/finallyOnEmptyReturn.kt diff --git a/compiler/testData/codegen/controlStructures/forInSmartCastedToArray.kt b/compiler/testData/codegen/box/controlStructures/forInSmartCastedToArray.kt similarity index 100% rename from compiler/testData/codegen/controlStructures/forInSmartCastedToArray.kt rename to compiler/testData/codegen/box/controlStructures/forInSmartCastedToArray.kt diff --git a/compiler/testData/codegen/controlStructures/forIntArray.kt b/compiler/testData/codegen/box/controlStructures/forIntArray.kt similarity index 99% rename from compiler/testData/codegen/controlStructures/forIntArray.kt rename to compiler/testData/codegen/box/controlStructures/forIntArray.kt index abfce4113f7..02a95f33356 100644 --- a/compiler/testData/codegen/controlStructures/forIntArray.kt +++ b/compiler/testData/codegen/box/controlStructures/forIntArray.kt @@ -11,4 +11,4 @@ fun box() : String { if(sum != 10) return "a failed" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/controlStructures/forIntRange.kt b/compiler/testData/codegen/box/controlStructures/forIntRange.kt similarity index 99% rename from compiler/testData/codegen/controlStructures/forIntRange.kt rename to compiler/testData/codegen/box/controlStructures/forIntRange.kt index abe4d5cd808..6dd9278c030 100644 --- a/compiler/testData/codegen/controlStructures/forIntRange.kt +++ b/compiler/testData/codegen/box/controlStructures/forIntRange.kt @@ -10,4 +10,4 @@ fun box() : String { } if (result != 3) return "FAIL" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/controlStructures/forLoopMemberExtensionAll.kt b/compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionAll.kt similarity index 100% rename from compiler/testData/codegen/controlStructures/forLoopMemberExtensionAll.kt rename to compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionAll.kt diff --git a/compiler/testData/codegen/controlStructures/forLoopMemberExtensionHasNext.kt b/compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionHasNext.kt similarity index 100% rename from compiler/testData/codegen/controlStructures/forLoopMemberExtensionHasNext.kt rename to compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionHasNext.kt diff --git a/compiler/testData/codegen/controlStructures/forLoopMemberExtensionNext.kt b/compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionNext.kt similarity index 100% rename from compiler/testData/codegen/controlStructures/forLoopMemberExtensionNext.kt rename to compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionNext.kt diff --git a/compiler/testData/codegen/controlStructures/forNullableIntArray.kt b/compiler/testData/codegen/box/controlStructures/forNullableIntArray.kt similarity index 99% rename from compiler/testData/codegen/controlStructures/forNullableIntArray.kt rename to compiler/testData/codegen/box/controlStructures/forNullableIntArray.kt index e45df9c691e..10e29bcba89 100644 --- a/compiler/testData/codegen/controlStructures/forNullableIntArray.kt +++ b/compiler/testData/codegen/box/controlStructures/forNullableIntArray.kt @@ -12,4 +12,4 @@ fun box() : String { if(sum != 10) return "b failed" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/controlStructures/forPrimitiveIntArray.kt b/compiler/testData/codegen/box/controlStructures/forPrimitiveIntArray.kt similarity index 99% rename from compiler/testData/codegen/controlStructures/forPrimitiveIntArray.kt rename to compiler/testData/codegen/box/controlStructures/forPrimitiveIntArray.kt index 0822b4f6aac..566894de73a 100644 --- a/compiler/testData/codegen/controlStructures/forPrimitiveIntArray.kt +++ b/compiler/testData/codegen/box/controlStructures/forPrimitiveIntArray.kt @@ -11,4 +11,4 @@ fun box() : String { if(sum != 10) return "a failed" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/controlStructures/forUserType.kt b/compiler/testData/codegen/box/controlStructures/forUserType.kt similarity index 100% rename from compiler/testData/codegen/controlStructures/forUserType.kt rename to compiler/testData/codegen/box/controlStructures/forUserType.kt diff --git a/compiler/testData/codegen/controlStructures/inRangeConditionsInWhen.kt b/compiler/testData/codegen/box/controlStructures/inRangeConditionsInWhen.kt similarity index 98% rename from compiler/testData/codegen/controlStructures/inRangeConditionsInWhen.kt rename to compiler/testData/codegen/box/controlStructures/inRangeConditionsInWhen.kt index cfd2184b0eb..edc2a762d9d 100644 --- a/compiler/testData/codegen/controlStructures/inRangeConditionsInWhen.kt +++ b/compiler/testData/codegen/box/controlStructures/inRangeConditionsInWhen.kt @@ -5,4 +5,4 @@ fun box(): String { in 2 -> return "OK" else -> return "fail" } -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1441.kt b/compiler/testData/codegen/box/controlStructures/kt1441.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1441.kt rename to compiler/testData/codegen/box/controlStructures/kt1441.kt diff --git a/compiler/testData/codegen/regressions/kt1688.kt b/compiler/testData/codegen/box/controlStructures/kt1688.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1688.kt rename to compiler/testData/codegen/box/controlStructures/kt1688.kt diff --git a/compiler/testData/codegen/regressions/kt1742.kt b/compiler/testData/codegen/box/controlStructures/kt1742.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1742.kt rename to compiler/testData/codegen/box/controlStructures/kt1742.kt diff --git a/compiler/testData/codegen/regressions/kt1899.kt b/compiler/testData/codegen/box/controlStructures/kt1899.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1899.kt rename to compiler/testData/codegen/box/controlStructures/kt1899.kt diff --git a/compiler/testData/codegen/regressions/kt2062.kt b/compiler/testData/codegen/box/controlStructures/kt2062.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2062.kt rename to compiler/testData/codegen/box/controlStructures/kt2062.kt diff --git a/compiler/testData/codegen/regressions/kt2147.kt b/compiler/testData/codegen/box/controlStructures/kt2147.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2147.kt rename to compiler/testData/codegen/box/controlStructures/kt2147.kt diff --git a/compiler/testData/codegen/regressions/kt2259.kt b/compiler/testData/codegen/box/controlStructures/kt2259.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2259.kt rename to compiler/testData/codegen/box/controlStructures/kt2259.kt diff --git a/compiler/testData/codegen/regressions/kt2291.kt b/compiler/testData/codegen/box/controlStructures/kt2291.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2291.kt rename to compiler/testData/codegen/box/controlStructures/kt2291.kt diff --git a/compiler/testData/codegen/regressions/kt237.kt b/compiler/testData/codegen/box/controlStructures/kt237.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt237.kt rename to compiler/testData/codegen/box/controlStructures/kt237.kt index cc96a0e9643..e07c8bfdbfa 100644 --- a/compiler/testData/codegen/regressions/kt237.kt +++ b/compiler/testData/codegen/box/controlStructures/kt237.kt @@ -38,4 +38,4 @@ fun box() : String { almostFilter(a, { (el : Int) : Int -> el }) main(null) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt2416.kt b/compiler/testData/codegen/box/controlStructures/kt2416.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2416.kt rename to compiler/testData/codegen/box/controlStructures/kt2416.kt diff --git a/compiler/testData/codegen/regressions/kt2577.kt b/compiler/testData/codegen/box/controlStructures/kt2577.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2577.kt rename to compiler/testData/codegen/box/controlStructures/kt2577.kt diff --git a/compiler/testData/codegen/regressions/kt2597.kt b/compiler/testData/codegen/box/controlStructures/kt2597.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2597.kt rename to compiler/testData/codegen/box/controlStructures/kt2597.kt diff --git a/compiler/testData/codegen/regressions/kt2598.kt b/compiler/testData/codegen/box/controlStructures/kt2598.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2598.kt rename to compiler/testData/codegen/box/controlStructures/kt2598.kt diff --git a/compiler/testData/codegen/regressions/kt299.kt b/compiler/testData/codegen/box/controlStructures/kt299.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt299.kt rename to compiler/testData/codegen/box/controlStructures/kt299.kt index 4aa31a44dc8..eaf27e80197 100644 --- a/compiler/testData/codegen/regressions/kt299.kt +++ b/compiler/testData/codegen/box/controlStructures/kt299.kt @@ -14,4 +14,4 @@ fun box(): String { return "fail 2" } return "fail 1" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt3087.kt b/compiler/testData/codegen/box/controlStructures/kt3087.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt3087.kt rename to compiler/testData/codegen/box/controlStructures/kt3087.kt diff --git a/compiler/testData/codegen/regressions/kt3203_1.kt b/compiler/testData/codegen/box/controlStructures/kt3203_1.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt3203_1.kt rename to compiler/testData/codegen/box/controlStructures/kt3203_1.kt diff --git a/compiler/testData/codegen/regressions/kt3203_2.kt b/compiler/testData/codegen/box/controlStructures/kt3203_2.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt3203_2.kt rename to compiler/testData/codegen/box/controlStructures/kt3203_2.kt diff --git a/compiler/testData/codegen/regressions/kt3273.kt b/compiler/testData/codegen/box/controlStructures/kt3273.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt3273.kt rename to compiler/testData/codegen/box/controlStructures/kt3273.kt index cf782e140af..187dc50ecf8 100644 --- a/compiler/testData/codegen/regressions/kt3273.kt +++ b/compiler/testData/codegen/box/controlStructures/kt3273.kt @@ -18,4 +18,4 @@ public fun testCoalesce() { fun box(): String { testCoalesce() return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt416.kt b/compiler/testData/codegen/box/controlStructures/kt416.kt similarity index 97% rename from compiler/testData/codegen/regressions/kt416.kt rename to compiler/testData/codegen/box/controlStructures/kt416.kt index a2108a6b9fb..85876312256 100644 --- a/compiler/testData/codegen/regressions/kt416.kt +++ b/compiler/testData/codegen/box/controlStructures/kt416.kt @@ -1,4 +1,4 @@ fun box() : String { var a = 10 return if(a?.plus(10) == 20) "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt513.kt b/compiler/testData/codegen/box/controlStructures/kt513.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt513.kt rename to compiler/testData/codegen/box/controlStructures/kt513.kt index d6aef72365d..9f463f327d4 100644 --- a/compiler/testData/codegen/regressions/kt513.kt +++ b/compiler/testData/codegen/box/controlStructures/kt513.kt @@ -21,4 +21,4 @@ fun box() : String{ A().test(list) System.out?.println(list) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt628.kt b/compiler/testData/codegen/box/controlStructures/kt628.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt628.kt rename to compiler/testData/codegen/box/controlStructures/kt628.kt index 32ff6d416f8..c801c62fbaf 100644 --- a/compiler/testData/codegen/regressions/kt628.kt +++ b/compiler/testData/codegen/box/controlStructures/kt628.kt @@ -45,4 +45,4 @@ fun box() : String { if(test12() != "OK") return "fail" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt769.kt b/compiler/testData/codegen/box/controlStructures/kt769.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt769.kt rename to compiler/testData/codegen/box/controlStructures/kt769.kt index 0bfe012e7be..52d37d51ad8 100644 --- a/compiler/testData/codegen/regressions/kt769.kt +++ b/compiler/testData/codegen/box/controlStructures/kt769.kt @@ -8,4 +8,4 @@ fun box() : String { } System.out?.println(i) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt772.kt b/compiler/testData/codegen/box/controlStructures/kt772.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt772.kt rename to compiler/testData/codegen/box/controlStructures/kt772.kt index bb45a0c94d1..6facb9ef23d 100644 --- a/compiler/testData/codegen/regressions/kt772.kt +++ b/compiler/testData/codegen/box/controlStructures/kt772.kt @@ -22,4 +22,4 @@ fun test(i : Int) { fun box() : String { for (i in 1..12) test(i) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt773.kt b/compiler/testData/codegen/box/controlStructures/kt773.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt773.kt rename to compiler/testData/codegen/box/controlStructures/kt773.kt index bb45a0c94d1..6facb9ef23d 100644 --- a/compiler/testData/codegen/regressions/kt773.kt +++ b/compiler/testData/codegen/box/controlStructures/kt773.kt @@ -22,4 +22,4 @@ fun test(i : Int) { fun box() : String { for (i in 1..12) test(i) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt870.kt b/compiler/testData/codegen/box/controlStructures/kt870.kt similarity index 93% rename from compiler/testData/codegen/regressions/kt870.kt rename to compiler/testData/codegen/box/controlStructures/kt870.kt index 9f83928b716..9dde0366a40 100644 --- a/compiler/testData/codegen/regressions/kt870.kt +++ b/compiler/testData/codegen/box/controlStructures/kt870.kt @@ -2,4 +2,4 @@ fun box() = when { 1 > 2 -> "false" 1 >= 1 -> "OK" else -> "else" - } \ No newline at end of file + } diff --git a/compiler/testData/codegen/regressions/kt910.kt b/compiler/testData/codegen/box/controlStructures/kt910.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt910.kt rename to compiler/testData/codegen/box/controlStructures/kt910.kt diff --git a/compiler/testData/codegen/box/controlStructures/kt958.kt b/compiler/testData/codegen/box/controlStructures/kt958.kt new file mode 100644 index 00000000000..f32079bfb69 --- /dev/null +++ b/compiler/testData/codegen/box/controlStructures/kt958.kt @@ -0,0 +1,3 @@ +fun test() = 239 + +fun box() = if(test() in 239..240) "OK" else "fail" diff --git a/compiler/testData/codegen/regressions/kt998.kt b/compiler/testData/codegen/box/controlStructures/kt998.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt998.kt rename to compiler/testData/codegen/box/controlStructures/kt998.kt index 5f219794187..a9a3296dae0 100644 --- a/compiler/testData/codegen/regressions/kt998.kt +++ b/compiler/testData/codegen/box/controlStructures/kt998.kt @@ -31,4 +31,4 @@ fun box() : String { if(findPairless(a) != 5) return "fail" return if(hasDuplicates(a)) "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/controlStructures/longRange.kt b/compiler/testData/codegen/box/controlStructures/longRange.kt similarity index 98% rename from compiler/testData/codegen/controlStructures/longRange.kt rename to compiler/testData/codegen/box/controlStructures/longRange.kt index 0f2acee8a6c..b1ab17ee093 100644 --- a/compiler/testData/codegen/controlStructures/longRange.kt +++ b/compiler/testData/codegen/box/controlStructures/longRange.kt @@ -5,4 +5,4 @@ fun box(): String { s += l } return if (s == "12") "OK" else "fail: $s" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/controlStructures/quicksort.kt b/compiler/testData/codegen/box/controlStructures/quicksort.kt similarity index 100% rename from compiler/testData/codegen/controlStructures/quicksort.kt rename to compiler/testData/codegen/box/controlStructures/quicksort.kt diff --git a/compiler/testData/codegen/controlStructures/tryCatchFinallyChain.kt b/compiler/testData/codegen/box/controlStructures/tryCatchFinallyChain.kt similarity index 100% rename from compiler/testData/codegen/controlStructures/tryCatchFinallyChain.kt rename to compiler/testData/codegen/box/controlStructures/tryCatchFinallyChain.kt diff --git a/compiler/testData/codegen/enum/abstractMethodInEnum.kt b/compiler/testData/codegen/box/enum/abstractMethodInEnum.kt similarity index 100% rename from compiler/testData/codegen/enum/abstractMethodInEnum.kt rename to compiler/testData/codegen/box/enum/abstractMethodInEnum.kt diff --git a/compiler/testData/codegen/enum/abstractmethod.kt b/compiler/testData/codegen/box/enum/abstractmethod.kt similarity index 99% rename from compiler/testData/codegen/enum/abstractmethod.kt rename to compiler/testData/codegen/box/enum/abstractmethod.kt index b831bf79e15..003a3708f53 100644 --- a/compiler/testData/codegen/enum/abstractmethod.kt +++ b/compiler/testData/codegen/box/enum/abstractmethod.kt @@ -7,4 +7,4 @@ enum class IssueState { } open fun ToString() : String = "O" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/enum/asReturnExpression.kt b/compiler/testData/codegen/box/enum/asReturnExpression.kt similarity index 100% rename from compiler/testData/codegen/enum/asReturnExpression.kt rename to compiler/testData/codegen/box/enum/asReturnExpression.kt diff --git a/compiler/testData/codegen/enum/entrywithinner.kt b/compiler/testData/codegen/box/enum/entrywithinner.kt similarity index 99% rename from compiler/testData/codegen/enum/entrywithinner.kt rename to compiler/testData/codegen/box/enum/entrywithinner.kt index 73e82e8c4fb..456492ce012 100644 --- a/compiler/testData/codegen/enum/entrywithinner.kt +++ b/compiler/testData/codegen/box/enum/entrywithinner.kt @@ -17,4 +17,4 @@ enum class IssueState { } open fun ToString() : String = "O" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/enum/inFunction.kt b/compiler/testData/codegen/box/enum/inFunction.kt similarity index 83% rename from compiler/testData/codegen/enum/inFunction.kt rename to compiler/testData/codegen/box/enum/inFunction.kt index bcf9ae88113..48c9912b9a0 100644 --- a/compiler/testData/codegen/enum/inFunction.kt +++ b/compiler/testData/codegen/box/enum/inFunction.kt @@ -8,4 +8,4 @@ fun foo(): String { return E.OK.toString() } -fun box(): String = foo() \ No newline at end of file +fun box(): String = foo() diff --git a/compiler/testData/codegen/enum/inPackage.kt b/compiler/testData/codegen/box/enum/inPackage.kt similarity index 92% rename from compiler/testData/codegen/enum/inPackage.kt rename to compiler/testData/codegen/box/enum/inPackage.kt index bc63408f227..4e4e1f4bee9 100644 --- a/compiler/testData/codegen/enum/inPackage.kt +++ b/compiler/testData/codegen/box/enum/inPackage.kt @@ -1,14 +1,14 @@ -package test - -enum class Season { - WINTER - SPRING - SUMMER - AUTUMN -} - -fun foo(): Season = Season.SPRING - -fun box() = - if (foo() == Season.SPRING) "OK" - else "fail" +package test + +enum class Season { + WINTER + SPRING + SUMMER + AUTUMN +} + +fun foo(): Season = Season.SPRING + +fun box() = + if (foo() == Season.SPRING) "OK" + else "fail" diff --git a/compiler/testData/codegen/enum/inclassobj.kt b/compiler/testData/codegen/box/enum/inclassobj.kt similarity index 99% rename from compiler/testData/codegen/enum/inclassobj.kt rename to compiler/testData/codegen/box/enum/inclassobj.kt index 93a51f89657..60e5de1c264 100644 --- a/compiler/testData/codegen/enum/inclassobj.kt +++ b/compiler/testData/codegen/box/enum/inclassobj.kt @@ -12,4 +12,4 @@ public class Context public val operatingSystemType: OsType get() = OsType.OTHER } -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/enum/inner.kt b/compiler/testData/codegen/box/enum/inner.kt similarity index 100% rename from compiler/testData/codegen/enum/inner.kt rename to compiler/testData/codegen/box/enum/inner.kt diff --git a/compiler/testData/codegen/enum/innerWithExistingClassObject.kt b/compiler/testData/codegen/box/enum/innerWithExistingClassObject.kt similarity index 100% rename from compiler/testData/codegen/enum/innerWithExistingClassObject.kt rename to compiler/testData/codegen/box/enum/innerWithExistingClassObject.kt diff --git a/compiler/testData/codegen/regressions/kt1119.kt b/compiler/testData/codegen/box/enum/kt1119.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1119.kt rename to compiler/testData/codegen/box/enum/kt1119.kt diff --git a/compiler/testData/codegen/regressions/kt2350.kt b/compiler/testData/codegen/box/enum/kt2350.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2350.kt rename to compiler/testData/codegen/box/enum/kt2350.kt diff --git a/compiler/testData/codegen/regressions/kt2673.kt b/compiler/testData/codegen/box/enum/kt2673.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2673.kt rename to compiler/testData/codegen/box/enum/kt2673.kt diff --git a/compiler/testData/codegen/enum/name.kt b/compiler/testData/codegen/box/enum/name.kt similarity index 100% rename from compiler/testData/codegen/enum/name.kt rename to compiler/testData/codegen/box/enum/name.kt diff --git a/compiler/testData/codegen/enum/ordinal.kt b/compiler/testData/codegen/box/enum/ordinal.kt similarity index 100% rename from compiler/testData/codegen/enum/ordinal.kt rename to compiler/testData/codegen/box/enum/ordinal.kt diff --git a/compiler/testData/codegen/enum/simple.kt b/compiler/testData/codegen/box/enum/simple.kt similarity index 100% rename from compiler/testData/codegen/enum/simple.kt rename to compiler/testData/codegen/box/enum/simple.kt diff --git a/compiler/testData/codegen/enum/toString.kt b/compiler/testData/codegen/box/enum/toString.kt similarity index 100% rename from compiler/testData/codegen/enum/toString.kt rename to compiler/testData/codegen/box/enum/toString.kt diff --git a/compiler/testData/codegen/enum/valueof.kt b/compiler/testData/codegen/box/enum/valueof.kt similarity index 100% rename from compiler/testData/codegen/enum/valueof.kt rename to compiler/testData/codegen/box/enum/valueof.kt diff --git a/compiler/testData/codegen/regressions/kt1061.kt b/compiler/testData/codegen/box/extensionFunctions/kt1061.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1061.kt rename to compiler/testData/codegen/box/extensionFunctions/kt1061.kt diff --git a/compiler/testData/codegen/regressions/kt1249.kt b/compiler/testData/codegen/box/extensionFunctions/kt1249.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1249.kt rename to compiler/testData/codegen/box/extensionFunctions/kt1249.kt diff --git a/compiler/testData/codegen/regressions/kt1290.kt b/compiler/testData/codegen/box/extensionFunctions/kt1290.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1290.kt rename to compiler/testData/codegen/box/extensionFunctions/kt1290.kt diff --git a/compiler/testData/codegen/regressions/kt1953.kt b/compiler/testData/codegen/box/extensionFunctions/kt1953.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1953.kt rename to compiler/testData/codegen/box/extensionFunctions/kt1953.kt diff --git a/compiler/testData/codegen/regressions/kt1953_class.kt b/compiler/testData/codegen/box/extensionFunctions/kt1953_class.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1953_class.kt rename to compiler/testData/codegen/box/extensionFunctions/kt1953_class.kt diff --git a/compiler/testData/codegen/regressions/kt475.kt b/compiler/testData/codegen/box/extensionFunctions/kt475.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt475.kt rename to compiler/testData/codegen/box/extensionFunctions/kt475.kt diff --git a/compiler/testData/codegen/regressions/kt606.kt b/compiler/testData/codegen/box/extensionFunctions/kt606.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt606.kt rename to compiler/testData/codegen/box/extensionFunctions/kt606.kt index b2012f84174..ed62435c2c9 100644 --- a/compiler/testData/codegen/regressions/kt606.kt +++ b/compiler/testData/codegen/box/extensionFunctions/kt606.kt @@ -26,4 +26,4 @@ trait ChannelPipelineFactory { fun box() : String { StandardPipelineFactory({ print("OK") }).getPipeline() return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt865.kt b/compiler/testData/codegen/box/extensionFunctions/kt865.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt865.kt rename to compiler/testData/codegen/box/extensionFunctions/kt865.kt index 794ae5de8b9..c13aba50662 100644 --- a/compiler/testData/codegen/regressions/kt865.kt +++ b/compiler/testData/codegen/box/extensionFunctions/kt865.kt @@ -16,4 +16,4 @@ fun box() : String { val u = Template() u.test() return if(u.collected.size() == 1 && u.collected.get(0) == "239") "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/extensionFunctions/nested2.kt b/compiler/testData/codegen/box/extensionFunctions/nested2.kt similarity index 100% rename from compiler/testData/codegen/extensionFunctions/nested2.kt rename to compiler/testData/codegen/box/extensionFunctions/nested2.kt diff --git a/compiler/testData/codegen/extensionFunctions/shared.kt b/compiler/testData/codegen/box/extensionFunctions/shared.kt similarity index 100% rename from compiler/testData/codegen/extensionFunctions/shared.kt rename to compiler/testData/codegen/box/extensionFunctions/shared.kt diff --git a/compiler/testData/codegen/extensionFunctions/virtual.kt b/compiler/testData/codegen/box/extensionFunctions/virtual.kt similarity index 100% rename from compiler/testData/codegen/extensionFunctions/virtual.kt rename to compiler/testData/codegen/box/extensionFunctions/virtual.kt diff --git a/compiler/testData/codegen/functions/defaultargs.kt b/compiler/testData/codegen/box/functions/defaultargs.kt similarity index 100% rename from compiler/testData/codegen/functions/defaultargs.kt rename to compiler/testData/codegen/box/functions/defaultargs.kt diff --git a/compiler/testData/codegen/functions/defaultargs1.kt b/compiler/testData/codegen/box/functions/defaultargs1.kt similarity index 100% rename from compiler/testData/codegen/functions/defaultargs1.kt rename to compiler/testData/codegen/box/functions/defaultargs1.kt diff --git a/compiler/testData/codegen/functions/defaultargs2.kt b/compiler/testData/codegen/box/functions/defaultargs2.kt similarity index 100% rename from compiler/testData/codegen/functions/defaultargs2.kt rename to compiler/testData/codegen/box/functions/defaultargs2.kt diff --git a/compiler/testData/codegen/functions/defaultargs3.kt b/compiler/testData/codegen/box/functions/defaultargs3.kt similarity index 100% rename from compiler/testData/codegen/functions/defaultargs3.kt rename to compiler/testData/codegen/box/functions/defaultargs3.kt diff --git a/compiler/testData/codegen/functions/defaultargs4.kt b/compiler/testData/codegen/box/functions/defaultargs4.kt similarity index 100% rename from compiler/testData/codegen/functions/defaultargs4.kt rename to compiler/testData/codegen/box/functions/defaultargs4.kt diff --git a/compiler/testData/codegen/functions/defaultargs5.kt b/compiler/testData/codegen/box/functions/defaultargs5.kt similarity index 100% rename from compiler/testData/codegen/functions/defaultargs5.kt rename to compiler/testData/codegen/box/functions/defaultargs5.kt diff --git a/compiler/testData/codegen/functions/defaultargs6.kt b/compiler/testData/codegen/box/functions/defaultargs6.kt similarity index 100% rename from compiler/testData/codegen/functions/defaultargs6.kt rename to compiler/testData/codegen/box/functions/defaultargs6.kt diff --git a/compiler/testData/codegen/functions/defaultargs7.kt b/compiler/testData/codegen/box/functions/defaultargs7.kt similarity index 100% rename from compiler/testData/codegen/functions/defaultargs7.kt rename to compiler/testData/codegen/box/functions/defaultargs7.kt diff --git a/compiler/testData/codegen/regressions/ea33909.kt b/compiler/testData/codegen/box/functions/ea33909.kt similarity index 100% rename from compiler/testData/codegen/regressions/ea33909.kt rename to compiler/testData/codegen/box/functions/ea33909.kt diff --git a/compiler/testData/codegen/functions/functionExpression.kt b/compiler/testData/codegen/box/functions/functionExpression.kt similarity index 100% rename from compiler/testData/codegen/functions/functionExpression.kt rename to compiler/testData/codegen/box/functions/functionExpression.kt diff --git a/compiler/testData/codegen/functions/invoke.kt b/compiler/testData/codegen/box/functions/invoke.kt similarity index 99% rename from compiler/testData/codegen/functions/invoke.kt rename to compiler/testData/codegen/box/functions/invoke.kt index 9fed2555868..13126ec2b83 100644 --- a/compiler/testData/codegen/functions/invoke.kt +++ b/compiler/testData/codegen/box/functions/invoke.kt @@ -25,4 +25,4 @@ fun box() : String { if (test4(Method(), 4) != 4) return "fail 4" if (test5(Method2(), "s") != "s") return "fail5" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1038.kt b/compiler/testData/codegen/box/functions/kt1038.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1038.kt rename to compiler/testData/codegen/box/functions/kt1038.kt diff --git a/compiler/testData/codegen/regressions/kt1199.kt b/compiler/testData/codegen/box/functions/kt1199.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1199.kt rename to compiler/testData/codegen/box/functions/kt1199.kt diff --git a/compiler/testData/codegen/regressions/kt1413.kt b/compiler/testData/codegen/box/functions/kt1413.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt1413.kt rename to compiler/testData/codegen/box/functions/kt1413.kt index dd2f68ceb40..6cc787850e1 100644 --- a/compiler/testData/codegen/regressions/kt1413.kt +++ b/compiler/testData/codegen/box/functions/kt1413.kt @@ -23,4 +23,4 @@ class Test{ fun box() : String { Test().foo() return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1649_1.kt b/compiler/testData/codegen/box/functions/kt1649_1.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1649_1.kt rename to compiler/testData/codegen/box/functions/kt1649_1.kt diff --git a/compiler/testData/codegen/regressions/kt1649_2.kt b/compiler/testData/codegen/box/functions/kt1649_2.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1649_2.kt rename to compiler/testData/codegen/box/functions/kt1649_2.kt diff --git a/compiler/testData/codegen/regressions/kt1739.kt b/compiler/testData/codegen/box/functions/kt1739.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt1739.kt rename to compiler/testData/codegen/box/functions/kt1739.kt index 832bb197224..29cbdb30f2a 100644 --- a/compiler/testData/codegen/regressions/kt1739.kt +++ b/compiler/testData/codegen/box/functions/kt1739.kt @@ -8,4 +8,4 @@ fun box() : String { var res = "" RunnableFunctionWrapper({ res = "OK" }).run() return res -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt2270.kt b/compiler/testData/codegen/box/functions/kt2270.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2270.kt rename to compiler/testData/codegen/box/functions/kt2270.kt diff --git a/compiler/testData/codegen/box/functions/kt2271.kt b/compiler/testData/codegen/box/functions/kt2271.kt new file mode 100644 index 00000000000..efc623a6519 --- /dev/null +++ b/compiler/testData/codegen/box/functions/kt2271.kt @@ -0,0 +1,3 @@ +fun foo(i: Int, j: Int = i) = j + +fun box() = if (foo(1) == 1) "OK" else "fail" diff --git a/compiler/testData/codegen/regressions/kt2280.kt b/compiler/testData/codegen/box/functions/kt2280.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2280.kt rename to compiler/testData/codegen/box/functions/kt2280.kt diff --git a/compiler/testData/codegen/regressions/kt2481.kt b/compiler/testData/codegen/box/functions/kt2481.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2481.kt rename to compiler/testData/codegen/box/functions/kt2481.kt diff --git a/compiler/testData/codegen/regressions/kt2716.kt b/compiler/testData/codegen/box/functions/kt2716.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2716.kt rename to compiler/testData/codegen/box/functions/kt2716.kt diff --git a/compiler/testData/codegen/regressions/kt2739.kt b/compiler/testData/codegen/box/functions/kt2739.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt2739.kt rename to compiler/testData/codegen/box/functions/kt2739.kt index dd2bdbf98df..b17e6f2e210 100644 --- a/compiler/testData/codegen/regressions/kt2739.kt +++ b/compiler/testData/codegen/box/functions/kt2739.kt @@ -7,4 +7,4 @@ class Pair(a: A) fun box(): String { val v = foo(Pair(1)) return if (v == null) "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt2929.kt b/compiler/testData/codegen/box/functions/kt2929.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2929.kt rename to compiler/testData/codegen/box/functions/kt2929.kt diff --git a/compiler/testData/codegen/regressions/kt395.kt b/compiler/testData/codegen/box/functions/kt395.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt395.kt rename to compiler/testData/codegen/box/functions/kt395.kt diff --git a/compiler/testData/codegen/regressions/kt785.kt b/compiler/testData/codegen/box/functions/kt785.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt785.kt rename to compiler/testData/codegen/box/functions/kt785.kt index add8bb72789..245d18a14ba 100644 --- a/compiler/testData/codegen/regressions/kt785.kt +++ b/compiler/testData/codegen/box/functions/kt785.kt @@ -10,4 +10,4 @@ fun box() : String { val a = A() a.z() //problem is here return if (a.x == 1) "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt873.kt b/compiler/testData/codegen/box/functions/kt873.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt873.kt rename to compiler/testData/codegen/box/functions/kt873.kt index 634102da8b7..21c3dcd3338 100644 --- a/compiler/testData/codegen/regressions/kt873.kt +++ b/compiler/testData/codegen/box/functions/kt873.kt @@ -8,4 +8,4 @@ fun box() : String { mspf = (((1000.0 / fps)).toLong()) } return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/functions/localFunction.kt b/compiler/testData/codegen/box/functions/localFunction.kt similarity index 99% rename from compiler/testData/codegen/functions/localFunction.kt rename to compiler/testData/codegen/box/functions/localFunction.kt index 9ec49ecbeda..b43377b6ab1 100644 --- a/compiler/testData/codegen/functions/localFunction.kt +++ b/compiler/testData/codegen/box/functions/localFunction.kt @@ -43,4 +43,4 @@ fun box() : String { return if(seed == 30) "OK" else seed.toString() -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/functions/nothisnoclosure.kt b/compiler/testData/codegen/box/functions/nothisnoclosure.kt similarity index 99% rename from compiler/testData/codegen/functions/nothisnoclosure.kt rename to compiler/testData/codegen/box/functions/nothisnoclosure.kt index a334a7850a3..6ff90a22afa 100644 --- a/compiler/testData/codegen/functions/nothisnoclosure.kt +++ b/compiler/testData/codegen/box/functions/nothisnoclosure.kt @@ -12,4 +12,4 @@ fun loop(var times : Int) { fun box() : String { loop(5) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/localcls/enum.kt b/compiler/testData/codegen/box/localClasses/enum.kt similarity index 100% rename from compiler/testData/codegen/localcls/enum.kt rename to compiler/testData/codegen/box/localClasses/enum.kt diff --git a/compiler/testData/codegen/localcls/noclosure.kt b/compiler/testData/codegen/box/localClasses/noclosure.kt similarity index 100% rename from compiler/testData/codegen/localcls/noclosure.kt rename to compiler/testData/codegen/box/localClasses/noclosure.kt diff --git a/compiler/testData/codegen/localcls/object.kt b/compiler/testData/codegen/box/localClasses/object.kt similarity index 100% rename from compiler/testData/codegen/localcls/object.kt rename to compiler/testData/codegen/box/localClasses/object.kt diff --git a/compiler/testData/codegen/localcls/withclosure.kt b/compiler/testData/codegen/box/localClasses/withclosure.kt similarity index 100% rename from compiler/testData/codegen/localcls/withclosure.kt rename to compiler/testData/codegen/box/localClasses/withclosure.kt diff --git a/compiler/testData/codegen/checkCast.kt b/compiler/testData/codegen/box/namespace/checkCast.kt similarity index 100% rename from compiler/testData/codegen/checkCast.kt rename to compiler/testData/codegen/box/namespace/checkCast.kt diff --git a/compiler/testData/codegen/incrementProperty.kt b/compiler/testData/codegen/box/namespace/incrementProperty.kt similarity index 100% rename from compiler/testData/codegen/incrementProperty.kt rename to compiler/testData/codegen/box/namespace/incrementProperty.kt diff --git a/compiler/testData/codegen/invokespecial.kt b/compiler/testData/codegen/box/namespace/invokespecial.kt similarity index 100% rename from compiler/testData/codegen/invokespecial.kt rename to compiler/testData/codegen/box/namespace/invokespecial.kt diff --git a/compiler/testData/codegen/namespaceQualifiedMethod.kt b/compiler/testData/codegen/box/namespace/namespaceQualifiedMethod.kt similarity index 100% rename from compiler/testData/codegen/namespaceQualifiedMethod.kt rename to compiler/testData/codegen/box/namespace/namespaceQualifiedMethod.kt diff --git a/compiler/testData/codegen/privateTopLevelPropAndVarInInner.kt b/compiler/testData/codegen/box/namespace/privateTopLevelPropAndVarInInner.kt similarity index 100% rename from compiler/testData/codegen/privateTopLevelPropAndVarInInner.kt rename to compiler/testData/codegen/box/namespace/privateTopLevelPropAndVarInInner.kt diff --git a/compiler/testData/codegen/objects/flist.kt b/compiler/testData/codegen/box/objects/flist.kt similarity index 99% rename from compiler/testData/codegen/objects/flist.kt rename to compiler/testData/codegen/box/objects/flist.kt index b85c8f4884e..e7dd47d25d0 100644 --- a/compiler/testData/codegen/objects/flist.kt +++ b/compiler/testData/codegen/box/objects/flist.kt @@ -50,4 +50,4 @@ fun box() : String { r += s } return r -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1047.kt b/compiler/testData/codegen/box/objects/kt1047.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt1047.kt rename to compiler/testData/codegen/box/objects/kt1047.kt index f2a87f05f7e..2698637902c 100644 --- a/compiler/testData/codegen/regressions/kt1047.kt +++ b/compiler/testData/codegen/box/objects/kt1047.kt @@ -10,4 +10,4 @@ public open class Test() { fun box() : String { Test().test() return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1136.kt b/compiler/testData/codegen/box/objects/kt1136.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt1136.kt rename to compiler/testData/codegen/box/objects/kt1136.kt index 2b563158319..e108facf9fd 100644 --- a/compiler/testData/codegen/regressions/kt1136.kt +++ b/compiler/testData/codegen/box/objects/kt1136.kt @@ -47,4 +47,4 @@ public fun box():String { obj.status?.printStackTrace() "failed" } -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1186.kt b/compiler/testData/codegen/box/objects/kt1186.kt similarity index 97% rename from compiler/testData/codegen/regressions/kt1186.kt rename to compiler/testData/codegen/box/objects/kt1186.kt index ddd42d63f12..20b94eebff1 100644 --- a/compiler/testData/codegen/regressions/kt1186.kt +++ b/compiler/testData/codegen/box/objects/kt1186.kt @@ -25,4 +25,4 @@ fun foo(d: Direction) = when(d) { } fun box() : String = - if (foo(Direction.EAST) == 4 && bar(Color.GREEN) == 2) "OK" else "fail" \ No newline at end of file + if (foo(Direction.EAST) == 4 && bar(Color.GREEN) == 2) "OK" else "fail" diff --git a/compiler/testData/codegen/regressions/kt1600.kt b/compiler/testData/codegen/box/objects/kt1600.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1600.kt rename to compiler/testData/codegen/box/objects/kt1600.kt diff --git a/compiler/testData/codegen/regressions/kt1737.kt b/compiler/testData/codegen/box/objects/kt1737.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1737.kt rename to compiler/testData/codegen/box/objects/kt1737.kt diff --git a/compiler/testData/codegen/regressions/kt2398.kt b/compiler/testData/codegen/box/objects/kt2398.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2398.kt rename to compiler/testData/codegen/box/objects/kt2398.kt diff --git a/compiler/testData/codegen/regressions/kt2663.kt b/compiler/testData/codegen/box/objects/kt2663.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt2663.kt rename to compiler/testData/codegen/box/objects/kt2663.kt index c3345820e57..e21643c26ce 100644 --- a/compiler/testData/codegen/regressions/kt2663.kt +++ b/compiler/testData/codegen/box/objects/kt2663.kt @@ -7,4 +7,4 @@ fun box() : String { } } return if (a == 2) "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt2663_2.kt b/compiler/testData/codegen/box/objects/kt2663_2.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt2663_2.kt rename to compiler/testData/codegen/box/objects/kt2663_2.kt index e14bd359f0b..ef7e9ea56f4 100644 --- a/compiler/testData/codegen/regressions/kt2663_2.kt +++ b/compiler/testData/codegen/box/objects/kt2663_2.kt @@ -7,4 +7,4 @@ fun box() : String { } }).run() return if (a == 2) "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt2675.kt b/compiler/testData/codegen/box/objects/kt2675.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2675.kt rename to compiler/testData/codegen/box/objects/kt2675.kt diff --git a/compiler/testData/codegen/regressions/kt2719.kt b/compiler/testData/codegen/box/objects/kt2719.kt similarity index 86% rename from compiler/testData/codegen/regressions/kt2719.kt rename to compiler/testData/codegen/box/objects/kt2719.kt index e4d51603b66..8a981bc099c 100644 --- a/compiler/testData/codegen/regressions/kt2719.kt +++ b/compiler/testData/codegen/box/objects/kt2719.kt @@ -6,4 +6,4 @@ class Clazz { } } -fun box() = "OK" \ No newline at end of file +fun box() = "OK" diff --git a/compiler/testData/codegen/regressions/kt2822.kt b/compiler/testData/codegen/box/objects/kt2822.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2822.kt rename to compiler/testData/codegen/box/objects/kt2822.kt diff --git a/compiler/testData/codegen/regressions/kt3238.kt b/compiler/testData/codegen/box/objects/kt3238.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt3238.kt rename to compiler/testData/codegen/box/objects/kt3238.kt diff --git a/compiler/testData/codegen/regressions/kt535.kt b/compiler/testData/codegen/box/objects/kt535.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt535.kt rename to compiler/testData/codegen/box/objects/kt535.kt index 575fd476bf4..ee2d078ee06 100644 --- a/compiler/testData/codegen/regressions/kt535.kt +++ b/compiler/testData/codegen/box/objects/kt535.kt @@ -18,4 +18,4 @@ fun box() : String { var i3 : Identifier? = Identifier.init("name") System.out?.println(i3?.getName()) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt560.kt b/compiler/testData/codegen/box/objects/kt560.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt560.kt rename to compiler/testData/codegen/box/objects/kt560.kt diff --git a/compiler/testData/codegen/regressions/kt640.kt b/compiler/testData/codegen/box/objects/kt640.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt640.kt rename to compiler/testData/codegen/box/objects/kt640.kt diff --git a/compiler/testData/codegen/regressions/kt694.kt b/compiler/testData/codegen/box/objects/kt694.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt694.kt rename to compiler/testData/codegen/box/objects/kt694.kt diff --git a/compiler/testData/codegen/objects/methodOnObject.kt b/compiler/testData/codegen/box/objects/methodOnObject.kt similarity index 100% rename from compiler/testData/codegen/objects/methodOnObject.kt rename to compiler/testData/codegen/box/objects/methodOnObject.kt diff --git a/compiler/testData/codegen/objects/objectLiteral.kt b/compiler/testData/codegen/box/objects/objectLiteral.kt similarity index 100% rename from compiler/testData/codegen/objects/objectLiteral.kt rename to compiler/testData/codegen/box/objects/objectLiteral.kt diff --git a/compiler/testData/codegen/objects/objectLiteralInClosure.kt b/compiler/testData/codegen/box/objects/objectLiteralInClosure.kt similarity index 100% rename from compiler/testData/codegen/objects/objectLiteralInClosure.kt rename to compiler/testData/codegen/box/objects/objectLiteralInClosure.kt diff --git a/compiler/testData/codegen/objects/receiverInConstructor.kt b/compiler/testData/codegen/box/objects/receiverInConstructor.kt similarity index 80% rename from compiler/testData/codegen/objects/receiverInConstructor.kt rename to compiler/testData/codegen/box/objects/receiverInConstructor.kt index 4ff54090b2e..b3b7a3dcb57 100644 --- a/compiler/testData/codegen/objects/receiverInConstructor.kt +++ b/compiler/testData/codegen/box/objects/receiverInConstructor.kt @@ -4,4 +4,4 @@ fun A.a(newv: String) = object: A("fail") { override val v = this@a.v + newv } -fun box() = A("O").a("K").v \ No newline at end of file +fun box() = A("O").a("K").v diff --git a/compiler/testData/codegen/objects/simpleObject.kt b/compiler/testData/codegen/box/objects/simpleObject.kt similarity index 100% rename from compiler/testData/codegen/objects/simpleObject.kt rename to compiler/testData/codegen/box/objects/simpleObject.kt diff --git a/compiler/testData/codegen/objects/thisInConstructor.kt b/compiler/testData/codegen/box/objects/thisInConstructor.kt similarity index 85% rename from compiler/testData/codegen/objects/thisInConstructor.kt rename to compiler/testData/codegen/box/objects/thisInConstructor.kt index 3e804f1dbd7..02f4ce346c9 100644 --- a/compiler/testData/codegen/objects/thisInConstructor.kt +++ b/compiler/testData/codegen/box/objects/thisInConstructor.kt @@ -7,4 +7,4 @@ open class B(open val v: String) { } } -fun box() = B("O").a("K").v \ No newline at end of file +fun box() = B("O").a("K").v diff --git a/compiler/testData/codegen/regressions/ea35963.kt b/compiler/testData/codegen/box/primitiveTypes/ea35963.kt similarity index 100% rename from compiler/testData/codegen/regressions/ea35963.kt rename to compiler/testData/codegen/box/primitiveTypes/ea35963.kt diff --git a/compiler/testData/codegen/emptyRanges.kt b/compiler/testData/codegen/box/primitiveTypes/emptyRanges.kt similarity index 100% rename from compiler/testData/codegen/emptyRanges.kt rename to compiler/testData/codegen/box/primitiveTypes/emptyRanges.kt diff --git a/compiler/testData/codegen/primitiveTypes/intLiteralIsNotNull.kt b/compiler/testData/codegen/box/primitiveTypes/intLiteralIsNotNull.kt similarity index 100% rename from compiler/testData/codegen/primitiveTypes/intLiteralIsNotNull.kt rename to compiler/testData/codegen/box/primitiveTypes/intLiteralIsNotNull.kt diff --git a/compiler/testData/codegen/regressions/kt1054.kt b/compiler/testData/codegen/box/primitiveTypes/kt1054.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt1054.kt rename to compiler/testData/codegen/box/primitiveTypes/kt1054.kt index 49207ebb1d5..6393e3a0ec0 100644 --- a/compiler/testData/codegen/regressions/kt1054.kt +++ b/compiler/testData/codegen/box/primitiveTypes/kt1054.kt @@ -14,4 +14,4 @@ fun Boolean.and(other : Boolean) : Boolean{ else { return false; } -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1055.kt b/compiler/testData/codegen/box/primitiveTypes/kt1055.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt1055.kt rename to compiler/testData/codegen/box/primitiveTypes/kt1055.kt index b8ecd4cfee4..7c97d9a3c0c 100644 --- a/compiler/testData/codegen/regressions/kt1055.kt +++ b/compiler/testData/codegen/box/primitiveTypes/kt1055.kt @@ -3,4 +3,4 @@ fun box() : String { if(!a.identityEquals(a)) return "fail 1" if(a identityEquals a) return "OK" return "fail 2" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1093.kt b/compiler/testData/codegen/box/primitiveTypes/kt1093.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1093.kt rename to compiler/testData/codegen/box/primitiveTypes/kt1093.kt diff --git a/compiler/testData/codegen/regressions/kt1508.kt b/compiler/testData/codegen/box/primitiveTypes/kt1508.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt1508.kt rename to compiler/testData/codegen/box/primitiveTypes/kt1508.kt index 9e52c4a7e9f..28e534afe39 100644 --- a/compiler/testData/codegen/regressions/kt1508.kt +++ b/compiler/testData/codegen/box/primitiveTypes/kt1508.kt @@ -3,4 +3,4 @@ fun test( n : Number ) = n.toInt().toLong() + n.toLong() fun box() : String { val n : Number = 10 return if(test(n) == 20.toLong()) "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1634.kt b/compiler/testData/codegen/box/primitiveTypes/kt1634.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1634.kt rename to compiler/testData/codegen/box/primitiveTypes/kt1634.kt diff --git a/compiler/testData/codegen/regressions/kt2251.kt b/compiler/testData/codegen/box/primitiveTypes/kt2251.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt2251.kt rename to compiler/testData/codegen/box/primitiveTypes/kt2251.kt index f331f062738..d75041090e5 100644 --- a/compiler/testData/codegen/regressions/kt2251.kt +++ b/compiler/testData/codegen/box/primitiveTypes/kt2251.kt @@ -36,4 +36,4 @@ fun box() : String { if(++yc != 21.toChar() || yc++ != 21.toChar() || yc != 22.toChar()) return "char fail" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt2269.kt b/compiler/testData/codegen/box/primitiveTypes/kt2269.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt2269.kt rename to compiler/testData/codegen/box/primitiveTypes/kt2269.kt index a836753105f..e1896168c8f 100644 --- a/compiler/testData/codegen/regressions/kt2269.kt +++ b/compiler/testData/codegen/box/primitiveTypes/kt2269.kt @@ -10,4 +10,4 @@ fun box() : String { return "fail" } return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt2275.kt b/compiler/testData/codegen/box/primitiveTypes/kt2275.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2275.kt rename to compiler/testData/codegen/box/primitiveTypes/kt2275.kt diff --git a/compiler/testData/codegen/regressions/kt239.kt b/compiler/testData/codegen/box/primitiveTypes/kt239.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt239.kt rename to compiler/testData/codegen/box/primitiveTypes/kt239.kt diff --git a/compiler/testData/codegen/regressions/kt242.kt b/compiler/testData/codegen/box/primitiveTypes/kt242.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt242.kt rename to compiler/testData/codegen/box/primitiveTypes/kt242.kt index 4e2de93cff3..c1a99510817 100644 --- a/compiler/testData/codegen/regressions/kt242.kt +++ b/compiler/testData/codegen/box/primitiveTypes/kt242.kt @@ -16,4 +16,4 @@ fun box() : String { if (j == k) {} if (k == j) {} return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt243.kt b/compiler/testData/codegen/box/primitiveTypes/kt243.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt243.kt rename to compiler/testData/codegen/box/primitiveTypes/kt243.kt index 1e96f08fe50..d771a125056 100644 --- a/compiler/testData/codegen/regressions/kt243.kt +++ b/compiler/testData/codegen/box/primitiveTypes/kt243.kt @@ -5,4 +5,4 @@ fun box() : String { val s = java.lang.String.valueOf(1) val l = java.util.Collections.emptyList() return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt248.kt b/compiler/testData/codegen/box/primitiveTypes/kt248.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt248.kt rename to compiler/testData/codegen/box/primitiveTypes/kt248.kt diff --git a/compiler/testData/codegen/regressions/kt2794.kt b/compiler/testData/codegen/box/primitiveTypes/kt2794.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt2794.kt rename to compiler/testData/codegen/box/primitiveTypes/kt2794.kt index 3e086f682b5..bd6c80dced5 100644 --- a/compiler/testData/codegen/regressions/kt2794.kt +++ b/compiler/testData/codegen/box/primitiveTypes/kt2794.kt @@ -3,4 +3,4 @@ fun box () : String { val s = 5.toShort() val c: Char = 'A' return if( "$b" == "4" && " $b" == " 4" && "$s" == "5" && " $s" == " 5" && "$c" == "A" && " $c" == " A") "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt3078.kt b/compiler/testData/codegen/box/primitiveTypes/kt3078.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt3078.kt rename to compiler/testData/codegen/box/primitiveTypes/kt3078.kt diff --git a/compiler/testData/codegen/regressions/kt446.kt b/compiler/testData/codegen/box/primitiveTypes/kt446.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt446.kt rename to compiler/testData/codegen/box/primitiveTypes/kt446.kt diff --git a/compiler/testData/codegen/regressions/kt518.kt b/compiler/testData/codegen/box/primitiveTypes/kt518.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt518.kt rename to compiler/testData/codegen/box/primitiveTypes/kt518.kt index 9b9ab40dc24..f1ec08f1c2f 100644 --- a/compiler/testData/codegen/regressions/kt518.kt +++ b/compiler/testData/codegen/box/primitiveTypes/kt518.kt @@ -12,4 +12,4 @@ fun foo(i : Int?, a : Any?) { fun box () : String { foo(2, "239") return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/primitiveTypes/kt665.kt b/compiler/testData/codegen/box/primitiveTypes/kt665.kt similarity index 100% rename from compiler/testData/codegen/primitiveTypes/kt665.kt rename to compiler/testData/codegen/box/primitiveTypes/kt665.kt diff --git a/compiler/testData/codegen/regressions/kt684.kt b/compiler/testData/codegen/box/primitiveTypes/kt684.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt684.kt rename to compiler/testData/codegen/box/primitiveTypes/kt684.kt diff --git a/compiler/testData/codegen/primitiveTypes/kt711.kt b/compiler/testData/codegen/box/primitiveTypes/kt711.kt similarity index 100% rename from compiler/testData/codegen/primitiveTypes/kt711.kt rename to compiler/testData/codegen/box/primitiveTypes/kt711.kt diff --git a/compiler/testData/codegen/primitiveTypes/kt737.kt b/compiler/testData/codegen/box/primitiveTypes/kt737.kt similarity index 100% rename from compiler/testData/codegen/primitiveTypes/kt737.kt rename to compiler/testData/codegen/box/primitiveTypes/kt737.kt diff --git a/compiler/testData/codegen/regressions/kt752.kt b/compiler/testData/codegen/box/primitiveTypes/kt752.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt752.kt rename to compiler/testData/codegen/box/primitiveTypes/kt752.kt index f473d6bae24..999da7f82bf 100644 --- a/compiler/testData/codegen/regressions/kt752.kt +++ b/compiler/testData/codegen/box/primitiveTypes/kt752.kt @@ -9,4 +9,4 @@ fun box() : String { for (i in x..y) System.out?.println(i.inv()) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt753.kt b/compiler/testData/codegen/box/primitiveTypes/kt753.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt753.kt rename to compiler/testData/codegen/box/primitiveTypes/kt753.kt index 483bc636cd6..1efa6bdb325 100644 --- a/compiler/testData/codegen/regressions/kt753.kt +++ b/compiler/testData/codegen/box/primitiveTypes/kt753.kt @@ -8,4 +8,4 @@ fun box() : String { System.out?.println(x.shl(y)) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt756.kt b/compiler/testData/codegen/box/primitiveTypes/kt756.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt756.kt rename to compiler/testData/codegen/box/primitiveTypes/kt756.kt index e8407abee1c..cb5ac5c36ae 100644 --- a/compiler/testData/codegen/regressions/kt756.kt +++ b/compiler/testData/codegen/box/primitiveTypes/kt756.kt @@ -9,4 +9,4 @@ fun box() : String { val x : Int? = 10 System.out?.println(x?.inv())// * x?.plus() * x?.dec() * x?.minus() as Number) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt757.kt b/compiler/testData/codegen/box/primitiveTypes/kt757.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt757.kt rename to compiler/testData/codegen/box/primitiveTypes/kt757.kt index 2683f2b72dd..701b5868e6c 100644 --- a/compiler/testData/codegen/regressions/kt757.kt +++ b/compiler/testData/codegen/box/primitiveTypes/kt757.kt @@ -6,4 +6,4 @@ fun box() : String { val x : Long? = 10 System.out?.println(x.inv()) return if(x.inv() == -11.toLong()) "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt765.kt b/compiler/testData/codegen/box/primitiveTypes/kt765.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt765.kt rename to compiler/testData/codegen/box/primitiveTypes/kt765.kt index 242a51ae0eb..48c77a6439c 100644 --- a/compiler/testData/codegen/regressions/kt765.kt +++ b/compiler/testData/codegen/box/primitiveTypes/kt765.kt @@ -10,4 +10,4 @@ fun box() : String { } return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt821.kt b/compiler/testData/codegen/box/primitiveTypes/kt821.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt821.kt rename to compiler/testData/codegen/box/primitiveTypes/kt821.kt diff --git a/compiler/testData/codegen/regressions/kt877.kt b/compiler/testData/codegen/box/primitiveTypes/kt877.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt877.kt rename to compiler/testData/codegen/box/primitiveTypes/kt877.kt diff --git a/compiler/testData/codegen/regressions/kt882.kt b/compiler/testData/codegen/box/primitiveTypes/kt882.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt882.kt rename to compiler/testData/codegen/box/primitiveTypes/kt882.kt index 9b59d1e6013..15da30a150e 100644 --- a/compiler/testData/codegen/regressions/kt882.kt +++ b/compiler/testData/codegen/box/primitiveTypes/kt882.kt @@ -4,4 +4,4 @@ val _0dbl : Double = 0.toDouble() fun box() : String { if(_0 != _0dbl) return "fail" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt887.kt b/compiler/testData/codegen/box/primitiveTypes/kt887.kt similarity index 95% rename from compiler/testData/codegen/regressions/kt887.kt rename to compiler/testData/codegen/box/primitiveTypes/kt887.kt index ee1c57ec1d3..c03be7c8835 100644 --- a/compiler/testData/codegen/regressions/kt887.kt +++ b/compiler/testData/codegen/box/primitiveTypes/kt887.kt @@ -2,4 +2,4 @@ class Book(val name: String) : Comparable { override fun compareTo(other: Book) = name.compareTo(other.name) } -fun box() = if(Book("239").compareTo(Book("932")) != 0) "OK" else "fail" \ No newline at end of file +fun box() = if(Book("239").compareTo(Book("932")) != 0) "OK" else "fail" diff --git a/compiler/testData/codegen/regressions/kt925.kt b/compiler/testData/codegen/box/primitiveTypes/kt925.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt925.kt rename to compiler/testData/codegen/box/primitiveTypes/kt925.kt index 33a85f84b8b..84e9ee305c6 100644 --- a/compiler/testData/codegen/regressions/kt925.kt +++ b/compiler/testData/codegen/box/primitiveTypes/kt925.kt @@ -51,4 +51,4 @@ fun box() : String { if(test5().not()) return "test4 failed" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt935.kt b/compiler/testData/codegen/box/primitiveTypes/kt935.kt similarity index 94% rename from compiler/testData/codegen/regressions/kt935.kt rename to compiler/testData/codegen/box/primitiveTypes/kt935.kt index 7b76c881cdf..7ca6d8b4dc2 100644 --- a/compiler/testData/codegen/regressions/kt935.kt +++ b/compiler/testData/codegen/box/primitiveTypes/kt935.kt @@ -27,4 +27,4 @@ fun bottlesOfBeer(count : Int) : String { fun print(message : String) { System.out?.print(message) } fun println(message : String) { System.out?.println(message) } fun StringBuilder.plusAssign(o : Any) { append(o) } -val Array.isEmpty : Boolean get() = size == 0 \ No newline at end of file +val Array.isEmpty : Boolean get() = size == 0 diff --git a/compiler/testData/codegen/regressions/kt944.kt b/compiler/testData/codegen/box/primitiveTypes/kt944.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt944.kt rename to compiler/testData/codegen/box/primitiveTypes/kt944.kt index 746739fba9a..6069cbcc041 100644 --- a/compiler/testData/codegen/regressions/kt944.kt +++ b/compiler/testData/codegen/box/primitiveTypes/kt944.kt @@ -5,4 +5,4 @@ fun box() : String { return "OK" } -val String?.indices : IntRange get() = IntRange(0, this!!.length) \ No newline at end of file +val String?.indices : IntRange get() = IntRange(0, this!!.length) diff --git a/compiler/testData/codegen/regressions/kt945.kt b/compiler/testData/codegen/box/primitiveTypes/kt945.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt945.kt rename to compiler/testData/codegen/box/primitiveTypes/kt945.kt diff --git a/compiler/testData/codegen/primitiveTypes/nullAsNullableIntIsNull.kt b/compiler/testData/codegen/box/primitiveTypes/nullAsNullableIntIsNull.kt similarity index 100% rename from compiler/testData/codegen/primitiveTypes/nullAsNullableIntIsNull.kt rename to compiler/testData/codegen/box/primitiveTypes/nullAsNullableIntIsNull.kt diff --git a/compiler/testData/codegen/primitiveTypes/unboxComparable.kt b/compiler/testData/codegen/box/primitiveTypes/unboxComparable.kt similarity index 100% rename from compiler/testData/codegen/primitiveTypes/unboxComparable.kt rename to compiler/testData/codegen/box/primitiveTypes/unboxComparable.kt diff --git a/compiler/testData/codegen/properties/accessToPrivateProperty.kt b/compiler/testData/codegen/box/properties/accessToPrivateProperty.kt similarity index 100% rename from compiler/testData/codegen/properties/accessToPrivateProperty.kt rename to compiler/testData/codegen/box/properties/accessToPrivateProperty.kt diff --git a/compiler/testData/codegen/properties/accessToPrivateSetter.kt b/compiler/testData/codegen/box/properties/accessToPrivateSetter.kt similarity index 100% rename from compiler/testData/codegen/properties/accessToPrivateSetter.kt rename to compiler/testData/codegen/box/properties/accessToPrivateSetter.kt diff --git a/compiler/testData/codegen/regressions/kt1159.kt b/compiler/testData/codegen/box/properties/kt1159.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt1159.kt rename to compiler/testData/codegen/box/properties/kt1159.kt index c8bb69a04c1..67fb822baeb 100644 --- a/compiler/testData/codegen/regressions/kt1159.kt +++ b/compiler/testData/codegen/box/properties/kt1159.kt @@ -13,4 +13,4 @@ public object RefreshQueue { fun box() : String { RefreshQueue return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1165.kt b/compiler/testData/codegen/box/properties/kt1165.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt1165.kt rename to compiler/testData/codegen/box/properties/kt1165.kt index 37825bd22d2..0a32a58b9e2 100644 --- a/compiler/testData/codegen/regressions/kt1165.kt +++ b/compiler/testData/codegen/box/properties/kt1165.kt @@ -10,4 +10,4 @@ public class PhysicalVirtualFile : VirtualFile() { fun box() : String { PhysicalVirtualFile() return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1168.kt b/compiler/testData/codegen/box/properties/kt1168.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1168.kt rename to compiler/testData/codegen/box/properties/kt1168.kt diff --git a/compiler/testData/codegen/regressions/kt1170.kt b/compiler/testData/codegen/box/properties/kt1170.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt1170.kt rename to compiler/testData/codegen/box/properties/kt1170.kt index 494f3c3e1a3..3b33740d7c6 100644 --- a/compiler/testData/codegen/regressions/kt1170.kt +++ b/compiler/testData/codegen/box/properties/kt1170.kt @@ -13,4 +13,4 @@ public class Subclass : BaseClass() { fun box(): String { val r = Subclass().getKindValue() + Subclass().kind return if(r == "Subclass Subclass ") "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1398.kt b/compiler/testData/codegen/box/properties/kt1398.kt similarity index 79% rename from compiler/testData/codegen/regressions/kt1398.kt rename to compiler/testData/codegen/box/properties/kt1398.kt index 791b724b229..24e4c78aad8 100644 --- a/compiler/testData/codegen/regressions/kt1398.kt +++ b/compiler/testData/codegen/box/properties/kt1398.kt @@ -4,4 +4,4 @@ class Foo(bar: String) : Base(bar) { fun something() = (bar as java.lang.String).toUpperCase() } -fun box() = Foo("ok").something() \ No newline at end of file +fun box() = Foo("ok").something() diff --git a/compiler/testData/codegen/regressions/kt1417.kt b/compiler/testData/codegen/box/properties/kt1417.kt similarity index 66% rename from compiler/testData/codegen/regressions/kt1417.kt rename to compiler/testData/codegen/box/properties/kt1417.kt index 01a76072892..95366a66a5d 100644 --- a/compiler/testData/codegen/regressions/kt1417.kt +++ b/compiler/testData/codegen/box/properties/kt1417.kt @@ -6,4 +6,4 @@ class B(value: String) : A(value) { fun toString() = "B($value)"; } -fun box() = if (B("4").toString() == "B(4)") "OK" else "fail" \ No newline at end of file +fun box() = if (B("4").toString() == "B(4)") "OK" else "fail" diff --git a/compiler/testData/codegen/regressions/kt1482_2279.kt b/compiler/testData/codegen/box/properties/kt1482_2279.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1482_2279.kt rename to compiler/testData/codegen/box/properties/kt1482_2279.kt diff --git a/compiler/testData/codegen/regressions/kt1714.kt b/compiler/testData/codegen/box/properties/kt1714.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt1714.kt rename to compiler/testData/codegen/box/properties/kt1714.kt index 86f35cde060..655312cc2b7 100644 --- a/compiler/testData/codegen/regressions/kt1714.kt +++ b/compiler/testData/codegen/box/properties/kt1714.kt @@ -20,4 +20,4 @@ public fun box() : String { AImpl().test test(AImpl()) return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1714_minimal.kt b/compiler/testData/codegen/box/properties/kt1714_minimal.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt1714_minimal.kt rename to compiler/testData/codegen/box/properties/kt1714_minimal.kt index b2698d614ab..dd255aa79f7 100644 --- a/compiler/testData/codegen/regressions/kt1714_minimal.kt +++ b/compiler/testData/codegen/box/properties/kt1714_minimal.kt @@ -9,4 +9,4 @@ class AImpl : A { public fun box() : String { (AImpl() : A).v return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1892.kt b/compiler/testData/codegen/box/properties/kt1892.kt similarity index 66% rename from compiler/testData/codegen/regressions/kt1892.kt rename to compiler/testData/codegen/box/properties/kt1892.kt index 8f1ff172a20..6b24e7943a1 100644 --- a/compiler/testData/codegen/regressions/kt1892.kt +++ b/compiler/testData/codegen/box/properties/kt1892.kt @@ -2,4 +2,4 @@ val Int.ext : () -> Int = { 5 } val Long.ext : Long = 4.ext().toLong() //(c.kt:4) val y : Long = 10.toLong().ext -fun box() : String = if (y == 5.toLong()) "OK" else "fail" \ No newline at end of file +fun box() : String = if (y == 5.toLong()) "OK" else "fail" diff --git a/compiler/testData/codegen/regressions/kt2331.kt b/compiler/testData/codegen/box/properties/kt2331.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt2331.kt rename to compiler/testData/codegen/box/properties/kt2331.kt index faa235985f5..a96dd67bf6d 100644 --- a/compiler/testData/codegen/regressions/kt2331.kt +++ b/compiler/testData/codegen/box/properties/kt2331.kt @@ -11,4 +11,4 @@ fun box() : String { val p = P() p.foo() return if (p.x == 4) "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt257.kt b/compiler/testData/codegen/box/properties/kt257.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt257.kt rename to compiler/testData/codegen/box/properties/kt257.kt index 45482c59216..299042d2f31 100644 --- a/compiler/testData/codegen/regressions/kt257.kt +++ b/compiler/testData/codegen/box/properties/kt257.kt @@ -17,4 +17,4 @@ fun box() : String { if(abi.t.r != 1) return "fail" */ return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt2655.kt b/compiler/testData/codegen/box/properties/kt2655.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt2655.kt rename to compiler/testData/codegen/box/properties/kt2655.kt index d632ea14ad2..d3cd1337273 100644 --- a/compiler/testData/codegen/regressions/kt2655.kt +++ b/compiler/testData/codegen/box/properties/kt2655.kt @@ -17,4 +17,4 @@ fun box() : String { val textField = TextFieldWrapper(SimpleTextField()) textField.setText("OK") return textField.getText() -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt2786.kt b/compiler/testData/codegen/box/properties/kt2786.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2786.kt rename to compiler/testData/codegen/box/properties/kt2786.kt diff --git a/compiler/testData/codegen/properties/kt2892.kt b/compiler/testData/codegen/box/properties/kt2892.kt similarity index 100% rename from compiler/testData/codegen/properties/kt2892.kt rename to compiler/testData/codegen/box/properties/kt2892.kt diff --git a/compiler/testData/codegen/regressions/kt613.kt b/compiler/testData/codegen/box/properties/kt613.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt613.kt rename to compiler/testData/codegen/box/properties/kt613.kt index bfc0c2565b1..4f55c044844 100644 --- a/compiler/testData/codegen/regressions/kt613.kt +++ b/compiler/testData/codegen/box/properties/kt613.kt @@ -12,4 +12,4 @@ class Test() { fun box() : String { var m = Test() return if((m.i)++ == 5 && ++(m.i) == 7 && m.tt() == 26) "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1572.kt b/compiler/testData/codegen/box/safeCall/kt1572.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1572.kt rename to compiler/testData/codegen/box/safeCall/kt1572.kt diff --git a/compiler/testData/codegen/regressions/kt232.kt b/compiler/testData/codegen/box/safeCall/kt232.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt232.kt rename to compiler/testData/codegen/box/safeCall/kt232.kt index c356e429d72..911fb0d825a 100644 --- a/compiler/testData/codegen/regressions/kt232.kt +++ b/compiler/testData/codegen/box/safeCall/kt232.kt @@ -7,4 +7,4 @@ class A() { fun box() : String { val a : A = A() return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt245.kt b/compiler/testData/codegen/box/safeCall/kt245.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt245.kt rename to compiler/testData/codegen/box/safeCall/kt245.kt index 3a40068ec94..41acc4caff7 100644 --- a/compiler/testData/codegen/regressions/kt245.kt +++ b/compiler/testData/codegen/box/safeCall/kt245.kt @@ -29,4 +29,4 @@ fun foo() { fun box() : String { return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt247.kt b/compiler/testData/codegen/box/safeCall/kt247.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt247.kt rename to compiler/testData/codegen/box/safeCall/kt247.kt diff --git a/compiler/testData/codegen/regressions/ea35743.kt b/compiler/testData/codegen/box/strings/ea35743.kt similarity index 100% rename from compiler/testData/codegen/regressions/ea35743.kt rename to compiler/testData/codegen/box/strings/ea35743.kt diff --git a/compiler/testData/codegen/regressions/kt881.kt b/compiler/testData/codegen/box/strings/kt881.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt881.kt rename to compiler/testData/codegen/box/strings/kt881.kt index ae67c84854c..ba9911d887e 100644 --- a/compiler/testData/codegen/regressions/kt881.kt +++ b/compiler/testData/codegen/box/strings/kt881.kt @@ -3,4 +3,4 @@ fun box() : String { if ("$b" != "2") return "fail" if ("${1+1}" != "2") return "fail" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt889.kt b/compiler/testData/codegen/box/strings/kt889.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt889.kt rename to compiler/testData/codegen/box/strings/kt889.kt diff --git a/compiler/testData/codegen/regressions/kt894.kt b/compiler/testData/codegen/box/strings/kt894.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt894.kt rename to compiler/testData/codegen/box/strings/kt894.kt index 6cc584b7287..e2aeb1f5bab 100644 --- a/compiler/testData/codegen/regressions/kt894.kt +++ b/compiler/testData/codegen/box/strings/kt894.kt @@ -5,4 +5,4 @@ fun stringConcat(n : Int) : String? { return string } -fun box() = if(stringConcat(3) == "LOL LOL LOL ") "OK" else "fail" \ No newline at end of file +fun box() = if(stringConcat(3) == "LOL LOL LOL ") "OK" else "fail" diff --git a/compiler/testData/codegen/multilineStringsWithTemplates.kt b/compiler/testData/codegen/box/strings/multilineStringsWithTemplates.kt similarity index 100% rename from compiler/testData/codegen/multilineStringsWithTemplates.kt rename to compiler/testData/codegen/box/strings/multilineStringsWithTemplates.kt diff --git a/compiler/testData/codegen/rawStrings.kt b/compiler/testData/codegen/box/strings/rawStrings.kt similarity index 98% rename from compiler/testData/codegen/rawStrings.kt rename to compiler/testData/codegen/box/strings/rawStrings.kt index a2f427814ef..caa5b8fc27a 100644 --- a/compiler/testData/codegen/rawStrings.kt +++ b/compiler/testData/codegen/box/strings/rawStrings.kt @@ -3,4 +3,4 @@ fun box() : String { if (s != " foo \\n bar ") return "Fail: '$s'" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/super/basicmethodSuperClass.kt b/compiler/testData/codegen/box/super/basicmethodSuperClass.kt similarity index 100% rename from compiler/testData/codegen/super/basicmethodSuperClass.kt rename to compiler/testData/codegen/box/super/basicmethodSuperClass.kt diff --git a/compiler/testData/codegen/super/basicmethodSuperTrait.kt b/compiler/testData/codegen/box/super/basicmethodSuperTrait.kt similarity index 100% rename from compiler/testData/codegen/super/basicmethodSuperTrait.kt rename to compiler/testData/codegen/box/super/basicmethodSuperTrait.kt diff --git a/compiler/testData/codegen/super/basicproperty.kt b/compiler/testData/codegen/box/super/basicproperty.kt similarity index 100% rename from compiler/testData/codegen/super/basicproperty.kt rename to compiler/testData/codegen/box/super/basicproperty.kt diff --git a/compiler/testData/codegen/super/enclosedFun.kt b/compiler/testData/codegen/box/super/enclosedFun.kt similarity index 100% rename from compiler/testData/codegen/super/enclosedFun.kt rename to compiler/testData/codegen/box/super/enclosedFun.kt diff --git a/compiler/testData/codegen/super/enclosedVar.kt b/compiler/testData/codegen/box/super/enclosedVar.kt similarity index 100% rename from compiler/testData/codegen/super/enclosedVar.kt rename to compiler/testData/codegen/box/super/enclosedVar.kt diff --git a/compiler/testData/codegen/super/innerClassLabeledSuper.kt b/compiler/testData/codegen/box/super/innerClassLabeledSuper.kt similarity index 100% rename from compiler/testData/codegen/super/innerClassLabeledSuper.kt rename to compiler/testData/codegen/box/super/innerClassLabeledSuper.kt diff --git a/compiler/testData/codegen/super/innerClassLabeledSuperProperty.kt b/compiler/testData/codegen/box/super/innerClassLabeledSuperProperty.kt similarity index 100% rename from compiler/testData/codegen/super/innerClassLabeledSuperProperty.kt rename to compiler/testData/codegen/box/super/innerClassLabeledSuperProperty.kt diff --git a/compiler/testData/codegen/super/multipleSuperTraits.kt b/compiler/testData/codegen/box/super/multipleSuperTraits.kt similarity index 100% rename from compiler/testData/codegen/super/multipleSuperTraits.kt rename to compiler/testData/codegen/box/super/multipleSuperTraits.kt diff --git a/compiler/testData/codegen/super/traitproperty.kt b/compiler/testData/codegen/box/super/traitproperty.kt similarity index 100% rename from compiler/testData/codegen/super/traitproperty.kt rename to compiler/testData/codegen/box/super/traitproperty.kt diff --git a/compiler/testData/codegen/traits/finalMethod.kt b/compiler/testData/codegen/box/traits/finalMethod.kt similarity index 100% rename from compiler/testData/codegen/traits/finalMethod.kt rename to compiler/testData/codegen/box/traits/finalMethod.kt diff --git a/compiler/testData/codegen/traits/inheritedFun.kt b/compiler/testData/codegen/box/traits/inheritedFun.kt similarity index 98% rename from compiler/testData/codegen/traits/inheritedFun.kt rename to compiler/testData/codegen/box/traits/inheritedFun.kt index 47fe9223907..1262b29ba06 100644 --- a/compiler/testData/codegen/traits/inheritedFun.kt +++ b/compiler/testData/codegen/box/traits/inheritedFun.kt @@ -7,4 +7,4 @@ class B() : A fun box() : String { return if (B().f() == 239) "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/traits/inheritedVar.kt b/compiler/testData/codegen/box/traits/inheritedVar.kt similarity index 98% rename from compiler/testData/codegen/traits/inheritedVar.kt rename to compiler/testData/codegen/box/traits/inheritedVar.kt index b24548fad27..f1aa0ab825b 100644 --- a/compiler/testData/codegen/traits/inheritedVar.kt +++ b/compiler/testData/codegen/box/traits/inheritedVar.kt @@ -11,4 +11,4 @@ class B() : A fun box() : String { return if (B().a == 239) "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1936_1.kt b/compiler/testData/codegen/box/traits/kt1936_1.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1936_1.kt rename to compiler/testData/codegen/box/traits/kt1936_1.kt diff --git a/compiler/testData/codegen/regressions/kt1936_2.kt b/compiler/testData/codegen/box/traits/kt1936_2.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1936_2.kt rename to compiler/testData/codegen/box/traits/kt1936_2.kt diff --git a/compiler/testData/codegen/regressions/kt2260.kt b/compiler/testData/codegen/box/traits/kt2260.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2260.kt rename to compiler/testData/codegen/box/traits/kt2260.kt diff --git a/compiler/testData/codegen/regressions/kt2399.kt b/compiler/testData/codegen/box/traits/kt2399.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2399.kt rename to compiler/testData/codegen/box/traits/kt2399.kt diff --git a/compiler/testData/codegen/regressions/kt2541.kt b/compiler/testData/codegen/box/traits/kt2541.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2541.kt rename to compiler/testData/codegen/box/traits/kt2541.kt diff --git a/compiler/testData/codegen/regressions/kt2963.kt b/compiler/testData/codegen/box/traits/kt2963.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2963.kt rename to compiler/testData/codegen/box/traits/kt2963.kt diff --git a/compiler/testData/codegen/traits/multiple.kt b/compiler/testData/codegen/box/traits/multiple.kt similarity index 100% rename from compiler/testData/codegen/traits/multiple.kt rename to compiler/testData/codegen/box/traits/multiple.kt diff --git a/compiler/testData/codegen/traits/simple.kt b/compiler/testData/codegen/box/traits/simple.kt similarity index 99% rename from compiler/testData/codegen/traits/simple.kt rename to compiler/testData/codegen/box/traits/simple.kt index f8119547d2d..e53c4bbecd7 100644 --- a/compiler/testData/codegen/traits/simple.kt +++ b/compiler/testData/codegen/box/traits/simple.kt @@ -9,4 +9,4 @@ class SimpleClassImpl() : SimpleClass { fun box() : String { val c = SimpleClassImpl() return if("239 SimpleClassImpl" == c.foo()) "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/traits/stdlib.kt b/compiler/testData/codegen/box/traits/stdlib.kt similarity index 100% rename from compiler/testData/codegen/traits/stdlib.kt rename to compiler/testData/codegen/box/traits/stdlib.kt diff --git a/compiler/testData/codegen/traits/traitFuncCall.kt b/compiler/testData/codegen/box/traits/traitFuncCall.kt similarity index 100% rename from compiler/testData/codegen/traits/traitFuncCall.kt rename to compiler/testData/codegen/box/traits/traitFuncCall.kt diff --git a/compiler/testData/codegen/traits/withRequired.kt b/compiler/testData/codegen/box/traits/withRequired.kt similarity index 100% rename from compiler/testData/codegen/traits/withRequired.kt rename to compiler/testData/codegen/box/traits/withRequired.kt diff --git a/compiler/testData/codegen/traits/withRequiredSuper.kt b/compiler/testData/codegen/box/traits/withRequiredSuper.kt similarity index 100% rename from compiler/testData/codegen/traits/withRequiredSuper.kt rename to compiler/testData/codegen/box/traits/withRequiredSuper.kt diff --git a/compiler/testData/codegen/traits/withRequiredSuperViaBridge.kt b/compiler/testData/codegen/box/traits/withRequiredSuperViaBridge.kt similarity index 100% rename from compiler/testData/codegen/traits/withRequiredSuperViaBridge.kt rename to compiler/testData/codegen/box/traits/withRequiredSuperViaBridge.kt diff --git a/compiler/testData/codegen/typeInfo/asInLoop.kt b/compiler/testData/codegen/box/typeInfo/asInLoop.kt similarity index 100% rename from compiler/testData/codegen/typeInfo/asInLoop.kt rename to compiler/testData/codegen/box/typeInfo/asInLoop.kt diff --git a/compiler/testData/codegen/typeInfo/inheritance.kt b/compiler/testData/codegen/box/typeInfo/inheritance.kt similarity index 99% rename from compiler/testData/codegen/typeInfo/inheritance.kt rename to compiler/testData/codegen/box/typeInfo/inheritance.kt index 3ee02657f34..66b0fbe29ee 100644 --- a/compiler/testData/codegen/typeInfo/inheritance.kt +++ b/compiler/testData/codegen/box/typeInfo/inheritance.kt @@ -8,4 +8,4 @@ class B (val e: T) : A() { fun box() : String { return if(A().plus("239").add().e == "239" ) "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/typeInfo/kt2811.kt b/compiler/testData/codegen/box/typeInfo/kt2811.kt similarity index 99% rename from compiler/testData/codegen/typeInfo/kt2811.kt rename to compiler/testData/codegen/box/typeInfo/kt2811.kt index 51aef75ea61..293eb80b20b 100644 --- a/compiler/testData/codegen/typeInfo/kt2811.kt +++ b/compiler/testData/codegen/box/typeInfo/kt2811.kt @@ -22,4 +22,4 @@ fun box(): String { return "OK" } return "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt511.kt b/compiler/testData/codegen/box/typeInfo/kt511.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt511.kt rename to compiler/testData/codegen/box/typeInfo/kt511.kt diff --git a/compiler/testData/codegen/typeInfo/primitiveTypeInfo.kt b/compiler/testData/codegen/box/typeInfo/primitiveTypeInfo.kt similarity index 100% rename from compiler/testData/codegen/typeInfo/primitiveTypeInfo.kt rename to compiler/testData/codegen/box/typeInfo/primitiveTypeInfo.kt diff --git a/compiler/testData/codegen/tuples/UnitValue.kt b/compiler/testData/codegen/box/unit/UnitValue.kt similarity index 97% rename from compiler/testData/codegen/tuples/UnitValue.kt rename to compiler/testData/codegen/box/unit/UnitValue.kt index 8037babc462..341f0304bc7 100644 --- a/compiler/testData/codegen/tuples/UnitValue.kt +++ b/compiler/testData/codegen/box/unit/UnitValue.kt @@ -2,4 +2,4 @@ fun foo() {} fun box(): String { return if (foo() == Unit.VALUE) "OK" else "Fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1978.kt b/compiler/testData/codegen/box/vararg/kt1978.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1978.kt rename to compiler/testData/codegen/box/vararg/kt1978.kt diff --git a/compiler/testData/codegen/regressions/kt581.kt b/compiler/testData/codegen/box/vararg/kt581.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt581.kt rename to compiler/testData/codegen/box/vararg/kt581.kt diff --git a/compiler/testData/codegen/regressions/kt796_797.kt b/compiler/testData/codegen/box/vararg/kt796_797.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt796_797.kt rename to compiler/testData/codegen/box/vararg/kt796_797.kt index 28a02606d39..865a7bba790 100644 --- a/compiler/testData/codegen/regressions/kt796_797.kt +++ b/compiler/testData/codegen/box/vararg/kt796_797.kt @@ -5,4 +5,4 @@ fun box() : String { val a : Array? = array("Str", "Str2") val i : Int? = 1 return if(a[i] == "Str2") "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/patternMatching/callProperty.kt b/compiler/testData/codegen/box/when/callProperty.kt similarity index 100% rename from compiler/testData/codegen/patternMatching/callProperty.kt rename to compiler/testData/codegen/box/when/callProperty.kt diff --git a/compiler/testData/codegen/patternMatching/is.kt b/compiler/testData/codegen/box/when/is.kt similarity index 100% rename from compiler/testData/codegen/patternMatching/is.kt rename to compiler/testData/codegen/box/when/is.kt diff --git a/compiler/testData/codegen/regressions/kt2457.kt b/compiler/testData/codegen/box/when/kt2457.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2457.kt rename to compiler/testData/codegen/box/when/kt2457.kt diff --git a/compiler/testData/codegen/patternMatching/kt2466.kt b/compiler/testData/codegen/box/when/kt2466.kt similarity index 100% rename from compiler/testData/codegen/patternMatching/kt2466.kt rename to compiler/testData/codegen/box/when/kt2466.kt diff --git a/compiler/testData/codegen/patternMatching/longInRange.kt b/compiler/testData/codegen/box/when/longInRange.kt similarity index 98% rename from compiler/testData/codegen/patternMatching/longInRange.kt rename to compiler/testData/codegen/box/when/longInRange.kt index 6a6df53f32e..17bea8bd3fd 100644 --- a/compiler/testData/codegen/patternMatching/longInRange.kt +++ b/compiler/testData/codegen/box/when/longInRange.kt @@ -6,4 +6,4 @@ fun box(): String { if (5 !in LongR()) return "fail 1" if (6 in LongR()) return "fail 2" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/patternMatching/matchNotNullAgainstNullable.kt b/compiler/testData/codegen/box/when/matchNotNullAgainstNullable.kt similarity index 100% rename from compiler/testData/codegen/patternMatching/matchNotNullAgainstNullable.kt rename to compiler/testData/codegen/box/when/matchNotNullAgainstNullable.kt diff --git a/compiler/testData/codegen/patternMatching/nullableWhen.kt b/compiler/testData/codegen/box/when/nullableWhen.kt similarity index 100% rename from compiler/testData/codegen/patternMatching/nullableWhen.kt rename to compiler/testData/codegen/box/when/nullableWhen.kt diff --git a/compiler/testData/codegen/patternMatching/range.kt b/compiler/testData/codegen/box/when/range.kt similarity index 99% rename from compiler/testData/codegen/patternMatching/range.kt rename to compiler/testData/codegen/box/when/range.kt index dc765a2b265..53dbaff1683 100644 --- a/compiler/testData/codegen/patternMatching/range.kt +++ b/compiler/testData/codegen/box/when/range.kt @@ -26,4 +26,4 @@ fun box(): String { if (result == "") return "OK" return result -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/patternMatching/whenArgumentIsEvaluatedOnlyOnce.kt b/compiler/testData/codegen/box/when/whenArgumentIsEvaluatedOnlyOnce.kt similarity index 99% rename from compiler/testData/codegen/patternMatching/whenArgumentIsEvaluatedOnlyOnce.kt rename to compiler/testData/codegen/box/when/whenArgumentIsEvaluatedOnlyOnce.kt index 462d14ac31f..ef67028722d 100644 --- a/compiler/testData/codegen/patternMatching/whenArgumentIsEvaluatedOnlyOnce.kt +++ b/compiler/testData/codegen/box/when/whenArgumentIsEvaluatedOnlyOnce.kt @@ -10,4 +10,4 @@ fun box(): String { else -> {} } return if (x == 1) "OK" else "fail 2" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt2271.kt b/compiler/testData/codegen/regressions/kt2271.kt deleted file mode 100644 index 0db53458956..00000000000 --- a/compiler/testData/codegen/regressions/kt2271.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun foo(i: Int, j: Int = i) = j - -fun box() = if (foo(1) == 1) "OK" else "fail" \ No newline at end of file diff --git a/compiler/testData/codegen/regressions/kt779.kt b/compiler/testData/codegen/regressions/kt779.kt deleted file mode 100644 index 12aa290eb67..00000000000 --- a/compiler/testData/codegen/regressions/kt779.kt +++ /dev/null @@ -1,3 +0,0 @@ -val Array.length : Int get() = this.size - -fun box() = if(Array(10, {1}).length == 10) "OK" else "fail" \ No newline at end of file diff --git a/compiler/testData/codegen/regressions/kt958.kt b/compiler/testData/codegen/regressions/kt958.kt deleted file mode 100644 index bc5fceff9f5..00000000000 --- a/compiler/testData/codegen/regressions/kt958.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun test() = 239 - -fun box() = if(test() in 239..240) "OK" else "fail" \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java index 6725f67c77c..0b9230c03bc 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java @@ -27,10 +27,6 @@ public class ArrayGenTest extends CodegenTestCase { createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY); } - public void testKt238() { - blackBoxFile("regressions/kt238.kt"); - } - public void testKt326() { // Disabled: java.lang.ClassCastException: [Ljava.lang.Object; cannot be cast to [Ljava.lang.Integer; /* @@ -38,10 +34,6 @@ public class ArrayGenTest extends CodegenTestCase { */ } - public void testKt779() { - blackBoxFile("regressions/kt779.kt"); - } - public void testCreateMultiInt() throws Exception { loadText("fun foo() = Array> (5, { Array(it, {239}) })"); Method foo = generateFunction(); @@ -89,144 +81,4 @@ public class ArrayGenTest extends CodegenTestCase { Object invoke = foo.invoke(null); assertTrue(invoke instanceof Integer); } - - public void testIterator() { - blackBoxFile("arrays/iterator.kt"); - } - - public void testIteratorLongArrayNextLong() { - blackBoxFile("arrays/iteratorLongArrayNextLong.kt"); - } - - public void testIteratorByteArrayNextByte() { - blackBoxFile("arrays/iteratorByteArrayNextByte.kt"); - } - - public void testForEachBooleanArray() { - blackBoxFile("arrays/forEachBooleanArray.kt"); - } - - public void testForEachByteArray() { - blackBoxFile("arrays/forEachByteArray.kt"); - } - - public void testForEachCharArray() { - blackBoxFile("arrays/forEachCharArray.kt"); - } - - public void testForEachDoubleArray() { - blackBoxFile("arrays/forEachDoubleArray.kt"); - } - - public void testForEachFloatArray() { - blackBoxFile("arrays/forEachFloatArray.kt"); - } - - public void testForEachIntArray() { - blackBoxFile("arrays/forEachIntArray.kt"); - } - - public void testForEachLongArray() { - blackBoxFile("arrays/forEachLongArray.kt"); - } - - public void testForEachShortArray() { - blackBoxFile("arrays/forEachShortArray.kt"); - } - - public void testIteratorBooleanArray() { - blackBoxFile("arrays/iteratorBooleanArray.kt"); - } - - public void testIteratorByteArray() { - blackBoxFile("arrays/iteratorByteArray.kt"); - } - - public void testIteratorCharArray() { - blackBoxFile("arrays/iteratorCharArray.kt"); - } - - public void testIteratorDoubleArray() { - blackBoxFile("arrays/iteratorDoubleArray.kt"); - } - - public void testIteratorFloatArray() { - blackBoxFile("arrays/iteratorFloatArray.kt"); - } - - public void testIteratorIntArray() { - blackBoxFile("arrays/iteratorIntArray.kt"); - } - - public void testIteratorLongArray() { - blackBoxFile("arrays/iteratorLongArray.kt"); - } - - public void testIteratorShortArray() { - blackBoxFile("arrays/iteratorShortArray.kt"); - } - - public void testArrayIndices() { - blackBoxFile("arrays/indices.kt"); - } - - public void testIndicesChar() { - blackBoxFile("arrays/indicesChar.kt"); - } - - public void testCollectionPlusAssign() { - blackBoxFile("regressions/kt33.kt"); - } - - public void testArrayPlusAssign() { - blackBoxFile("arrays/arrayPlusAssign.kt"); - } - - public void testCollectionAssignGetMultiIndex() { - blackBoxFile("arrays/collectionAssignGetMultiIndex.kt"); - } - - public void testArrayGetAssignMultiIndex() { - blackBoxFile("arrays/arrayGetAssignMultiIndex.kt"); - } - - public void testCollectionGetMultiIndex() { - blackBoxFile("arrays/collectionGetMultiIndex.kt"); - } - - public void testArrayGetMultiIndex() { - blackBoxFile("arrays/arrayGetMultiIndex.kt"); - } - - public void testHashMap() { - blackBoxFile("arrays/hashMap.kt"); - } - - public void testLongAsIndex() { - blackBoxFile("arrays/longAsIndex.kt"); - } - - public void testKt503() { - blackBoxFile("regressions/kt503.kt"); - } - - public void testKt602() { - blackBoxFile("regressions/kt602.kt"); - } - - public void testKt950() { - blackBoxFile("regressions/kt950.kt"); - } - - public void testKt594() { - blackBoxFile("regressions/kt594.kt"); - } - - public void testNonNullArray() { - blackBoxFile("arrays/nonNullArray.kt"); - } - - public void testArrayCast() { - blackBoxFile("regressions/kt2997.kt"); - } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java deleted file mode 100644 index f3ab4f1a358..00000000000 --- a/compiler/tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java +++ /dev/null @@ -1,171 +0,0 @@ -/* - * Copyright 2010-2012 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.codegen; - -import org.jetbrains.jet.ConfigurationKind; - -public class BridgeMethodGenTest extends CodegenTestCase { - @Override - protected void setUp() throws Exception { - super.setUp(); - createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY); - } - - public void testOverrideReturnType() { - blackBoxFile("bridges/overrideReturnType.kt"); - } - - public void testKt1959() { - blackBoxFile("regressions/kt1959.kt"); - } - - public void testDelegation() { - blackBoxFile("bridges/delegation.kt"); - } - - public void testDelegationProperty() { - blackBoxFile("bridges/delegationProperty.kt"); - } - - public void testDelegationToTraitImpl() { - blackBoxFile("bridges/delegationToTraitImpl.kt"); - } - - public void testDiamond() { - blackBoxFile("bridges/diamond.kt"); - } - - public void testLongChainOneBridge() { - blackBoxFile("bridges/longChainOneBridge.kt"); - } - - public void testManyTypeArgumentsSubstitutedSuccessively() { - blackBoxFile("bridges/manyTypeArgumentsSubstitutedSuccessively.kt"); - } - - public void testMethodFromTrait() { - blackBoxFile("bridges/methodFromTrait.kt"); - } - - public void testOverrideAbstractProperty() { - blackBoxFile("bridges/overrideAbstractProperty.kt"); - } - - public void testSimple() { - blackBoxFile("bridges/simple.kt"); - } - - public void testSimpleEnum() { - blackBoxFile("bridges/simpleEnum.kt"); - } - - public void testSimpleGenericMethod() { - blackBoxFile("bridges/simpleGenericMethod.kt"); - } - - public void testSimpleObject() { - blackBoxFile("bridges/simpleObject.kt"); - } - - public void testSimpleReturnType() { - blackBoxFile("bridges/simpleReturnType.kt"); - } - - public void testSimpleUpperBound() { - blackBoxFile("bridges/simpleUpperBound.kt"); - } - - public void testSubstitutionInSuperClass() { - blackBoxFile("bridges/substitutionInSuperClass.kt"); - } - - public void testSubstitutionInSuperClassDelegation() { - blackBoxFile("bridges/substitutionInSuperClassDelegation.kt"); - } - - public void testSubstitutionInSuperClassAbstractFun() { - blackBoxFile("bridges/substitutionInSuperClassAbstractFun.kt"); - } - - public void testSubstitutionInSuperClassBoundedTypeArguments() { - blackBoxFile("bridges/substitutionInSuperClassBoundedTypeArguments.kt"); - } - - public void testSubstitutionInSuperClassEnum() { - blackBoxFile("bridges/substitutionInSuperClassEnum.kt"); - } - - public void testSubstitutionInSuperClassGenericMethod() { - blackBoxFile("bridges/substitutionInSuperClassGenericMethod.kt"); - } - - public void testSubstitutionInSuperClassObject() { - blackBoxFile("bridges/substitutionInSuperClassObject.kt"); - } - - public void testSubstitutionInSuperClassUpperBound() { - blackBoxFile("bridges/substitutionInSuperClassUpperBound.kt"); - } - - public void testTwoParentsWithDifferentMethodsTwoBridges() { - blackBoxFile("bridges/twoParentsWithDifferentMethodsTwoBridges.kt"); - } - - public void testTwoParentsWithTheSameMethodOneBridge() { - blackBoxFile("bridges/twoParentsWithTheSameMethodOneBridge.kt"); - } - - public void testKt2498() { - blackBoxFile("regressions/kt2498.kt"); - } - - public void testKt1939() { - blackBoxFile("regressions/kt1939.kt"); - } - - public void testKt2702() { - blackBoxFile("regressions/kt2702.kt"); - } - - public void testKt2920() { - blackBoxFile("regressions/kt2920.kt"); - } - - public void testSubstitutionInSuperClassProperty() { - blackBoxFile("bridges/substitutionInSuperClassProperty.kt"); - } - - public void testPropertySetter() { - blackBoxFile("bridges/propertySetter.kt"); - } - - public void testPropertyDiamond() { - blackBoxFile("bridges/propertyDiamond.kt"); - } - - public void testPropertyAccessorsWithoutBody() { - blackBoxFile("bridges/propertyAccessorsWithoutBody.kt"); - } - - public void testPropertyInConstructor() { - blackBoxFile("bridges/propertyInConstructor.kt"); - } - - public void testKt2833() { - blackBoxFile("regressions/kt2833.kt"); - } -} diff --git a/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java index 74cc68bc0ed..19b4adcae5a 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java @@ -50,10 +50,6 @@ public class ClassGenTest extends CodegenTestCase { assertInstanceOf(aClass.newInstance(), List.class); } - public void testDelegationJavaIface() { - blackBoxFile("classes/delegationJava.kt"); - } - public void testDelegationToVal() throws Exception { loadFile("classes/delegationToVal.kt"); final ClassFileFactory state = generateClassesInFile(); @@ -84,58 +80,6 @@ public class ClassGenTest extends CodegenTestCase { assertEquals("OKOK", iActingMethod.invoke(test3.getMethod("getActing").invoke(obj))); } - public void testInheritanceAndDelegation_DelegatingDefaultConstructorProperties() { - blackBoxFile("classes/inheritance.kt"); - } - - public void testInheritanceAndDelegation2() { - blackBoxFile("classes/delegation2.kt"); - } - - public void testInheritanceAndDelegation3() { - blackBoxFile("classes/delegation3.kt"); - } - - public void testInheritanceAndDelegation4() { - blackBoxFile("classes/delegation4.kt"); - } - - public void testInheritanceAndDelegationTyped() { - blackBoxFile("classes/typedDelegation.kt"); - } - - public void testDelegationMethodsWithArgs() { - blackBoxFile("classes/delegationMethodsWithArgs.kt"); - } - - public void testDelegationGenericArg() { - blackBoxFile("classes/delegationGenericArg.kt"); - } - - public void testDelegationGenericLongArg() { - blackBoxFile("classes/delegationGenericLongArg.kt"); - } - - public void testDelegationGenericArgUpperBound() { - blackBoxFile("classes/delegationGenericArgUpperBound.kt"); - } - - public void testFunDelegation() { - blackBoxFile("classes/funDelegation.kt"); - } - - public void testPropertyDelegation() { - blackBoxFile("classes/propertyDelegation.kt"); - } - - public void testDiamondInheritance() { - blackBoxFile("classes/diamondInheritance.kt"); - } - - public void testRightHandOverride() { - blackBoxFile("classes/rightHandOverride.kt"); - } - public void testNewInstanceExplicitConstructor() throws Exception { loadFile("classes/newInstanceDefaultConstructor.kt"); final Method method = generateFunction("test"); @@ -143,22 +87,6 @@ public class ClassGenTest extends CodegenTestCase { assertEquals(610, returnValue.intValue()); } - public void testInnerClass() { - blackBoxFile("classes/innerClass.kt"); - } - - public void testInheritedInnerClass() { - blackBoxFile("classes/inheritedInnerClass.kt"); - } - - public void testKt2532() { - blackBoxFile("classes/kt2532.kt"); - } - - public void testInitializerBlock() { - blackBoxFile("classes/initializerBlock.kt"); - } - public void testAbstractMethod() throws Exception { loadText("abstract class Foo { abstract fun x(): String; fun y(): Int = 0 }"); final Class aClass = generateClass("Foo"); @@ -166,44 +94,12 @@ public class ClassGenTest extends CodegenTestCase { assertNotNull(findDeclaredMethodByName(aClass, "y")); } - public void testInheritedMethod() { - blackBoxFile("classes/inheritedMethod.kt"); - } - - public void testInitializerBlockDImpl() { - blackBoxFile("classes/initializerBlockDImpl.kt"); - } - - public void testPropertyInInitializer() { - blackBoxFile("classes/propertyInInitializer.kt"); - } - - public void testOuterThis() { - blackBoxFile("classes/outerThis.kt"); - } - - public void testExceptionConstructor() { - blackBoxFile("classes/exceptionConstructor.kt"); - } - - public void testSimpleBox() { - blackBoxFile("classes/simpleBox.kt"); - } - public void testAbstractClass() throws Exception { loadText("abstract class SimpleClass() { }"); final Class aClass = generateClass("SimpleClass"); assertTrue((aClass.getModifiers() & Modifier.ABSTRACT) != 0); } - public void testClassObject() { - blackBoxFile("classes/classObject.kt"); - } - - public void testClassObjectInTrait() { - blackBoxFile("classes/classObjectInTrait.kt"); - } - public void testClassObjectInterface() throws Exception { loadFile("classes/classObjectInterface.kt"); final Method method = generateFunction(); @@ -211,26 +107,6 @@ public class ClassGenTest extends CodegenTestCase { assertInstanceOf(result, Runnable.class); } - public void testOverloadBinaryOperator() { - blackBoxFile("classes/overloadBinaryOperator.kt"); - } - - public void testOverloadUnaryOperator() { - blackBoxFile("classes/overloadUnaryOperator.kt"); - } - - public void testOverloadPlusAssign() { - blackBoxFile("classes/overloadPlusAssign.kt"); - } - - public void testOverloadPlusAssignReturn() { - blackBoxFile("classes/overloadPlusAssignReturn.kt"); - } - - public void testOverloadPlusToPlusAssign() { - blackBoxFile("classes/overloadPlusToPlusAssign.kt"); - } - public void testEnumClass() throws Exception { loadText("enum class Direction { NORTH; SOUTH; EAST; WEST }"); final Class direction = generateClass("Direction"); @@ -248,218 +124,22 @@ public class ClassGenTest extends CodegenTestCase { assertEquals(0xFF0000, rgbMethod.invoke(redValue)); } - public void testClassObjFields() { - blackBoxFile("classes/classObjectField.kt"); - } - - public void testPrivateOuterProperty() { - blackBoxFile("classes/privateOuterProperty.kt"); - } - - public void testPrivateOuterFunctions() { - blackBoxFile("classes/privateOuterFunctions.kt"); - } - - public void testKt249() { - blackBoxFile("regressions/kt249.kt"); - } - - public void testKt48() { - blackBoxFile("regressions/kt48.kt"); - } - public void testKt309() { loadText("fun box() = null"); final Method method = generateFunction("box"); assertEquals(method.getReturnType().getName(), "java.lang.Object"); } - public void testKt343() { - blackBoxFile("regressions/kt343.kt"); - } - - public void testKt508() { - blackBoxFile("regressions/kt508.kt"); - } - - public void testKt504() { - blackBoxFile("regressions/kt504.kt"); - } - - public void testKt501() { - blackBoxFile("regressions/kt501.kt"); - } - - public void testKt496() { - blackBoxFile("regressions/kt496.kt"); - } - - public void testKt500() { - blackBoxFile("regressions/kt500.kt"); - } - - public void testKt285() { - blackBoxFile("regressions/kt285.kt"); - } - - public void testKt707() { - blackBoxFile("regressions/kt707.kt"); - } - - public void testKt903() { - blackBoxFile("regressions/kt903.kt"); - } - - public void testKt940() { - blackBoxFile("regressions/kt940.kt"); - } - - public void testKt1018() { - blackBoxFile("regressions/kt1018.kt"); - } - - public void testKt1120() { - blackBoxFile("regressions/kt1120.kt"); - } - - public void testSelfCreate() { - blackBoxFile("classes/selfcreate.kt"); - } - - public void testKt1134() { - blackBoxFile("regressions/kt1134.kt"); - } - - public void testKt1157() { - blackBoxFile("regressions/kt1157.kt"); - } - - public void testKt471() { - blackBoxFile("regressions/kt471.kt"); - } - /* public void testKt1213() { // blackBoxFile("regressions/kt1213.kt"); } */ - public void testKt723() { - blackBoxFile("regressions/kt723.kt"); - } - - public void testKt725() { - blackBoxFile("regressions/kt725.kt"); - } - - public void testKt633() { - blackBoxFile("regressions/kt633.kt"); - } - - public void testKt1345() { - blackBoxFile("regressions/kt1345.kt"); - } - - public void testKt1538() { - blackBoxFile("regressions/kt1538.kt"); - } - - public void testKt1759() { - blackBoxFile("regressions/kt1759.kt"); - } - - public void testResolveOrder() { - blackBoxFile("classes/resolveOrder.kt"); - } - - public void testKt1918() { - blackBoxFile("regressions/kt1918.kt"); - } - - public void testKt1247() { - blackBoxFile("regressions/kt1247.kt"); - } - - public void testKt1980() { - blackBoxFile("regressions/kt1980.kt"); - } - - public void testKt1578() { - blackBoxFile("regressions/kt1578.kt"); - } - - public void testKt1726() { - blackBoxFile("regressions/kt1726.kt"); - } - - public void testKt1721() { - blackBoxFile("regressions/kt1721.kt"); - } - - public void testKt1976() { - blackBoxFile("regressions/kt1976.kt"); - } - - public void testKt1439() { - blackBoxFile("regressions/kt1439.kt"); - } - - public void testKt1611() { - blackBoxFile("regressions/kt1611.kt"); - } - - public void testKt1891() { - blackBoxFile("regressions/kt1891.kt"); - } - - public void testKt2224() { - blackBoxFile("regressions/kt2224.kt"); - } - - public void testKt2384() { - blackBoxFile("regressions/kt2384.kt"); - } - - public void testKt2390() { - blackBoxFile("regressions/kt2390.kt"); - } - - public void testKt2391() { - blackBoxFile("regressions/kt2391.kt"); - } - public void testKt2060() { blackBoxMultiFile("regressions/kt2060_1.kt", "regressions/kt2060.kt"); } - public void testKt2395() { - blackBoxFile("regressions/kt2395.kt"); - } - - public void testKt2566() { - blackBoxFile("regressions/kt2566.kt"); - } - - public void testKt2566_2() { - blackBoxFile("regressions/kt2566_2.kt"); - } - - public void testKt2477() { - blackBoxFile("regressions/kt2477.kt"); - } - - public void testKt2485() { - blackBoxFile("regressions/kt2485.kt"); - } - - public void testKt2482() { - blackBoxFile("regressions/kt2482.kt"); - } - - public void testKt2288() { - blackBoxFile("regressions/kt2288.kt"); - } - public void testKt2257() { blackBoxMultiFile("regressions/kt2257_1.kt", "regressions/kt2257_2.kt"); } @@ -468,34 +148,6 @@ public class ClassGenTest extends CodegenTestCase { blackBoxMultiFile("regressions/kt1845_1.kt", "regressions/kt1845_2.kt"); } - public void testKt2417() { - blackBoxFile("regressions/kt2417.kt"); - } - - public void testKt2480() { - blackBoxFile("regressions/kt2480.kt"); - } - - public void testKt454() { - blackBoxFile("regressions/kt454.kt"); - } - - public void testKt1535() { - blackBoxFile("regressions/kt1535.kt"); - } - - public void testKt2711() { - blackBoxFile("regressions/kt2711.kt"); - } - - public void testKt2626() { - blackBoxFile("regressions/kt2626.kt"); - } - - public void testKt2607() { - blackBoxFile("regressions/kt2607.kt"); - } - public void testNoClassObjectForJavaClass() { blackBoxFileWithJava("stdlib/noClassObjectForJavaClass.kt"); } diff --git a/compiler/tests/org/jetbrains/jet/codegen/ClosuresGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/ClosuresGenTest.java deleted file mode 100644 index 615006d31ec..00000000000 --- a/compiler/tests/org/jetbrains/jet/codegen/ClosuresGenTest.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright 2010-2012 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.codegen; - -import org.jetbrains.jet.ConfigurationKind; - -public class ClosuresGenTest extends CodegenTestCase { - @Override - protected void setUp() throws Exception { - super.setUp(); - createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY); - } - - public void testSimplestClosure() { - blackBoxFile("classes/simplestClosure.kt"); - } - - public void testSimplestClosureAndBoxing() { - blackBoxFile("classes/simplestClosureAndBoxing.kt"); - } - - public void testClosureWithParameter() { - blackBoxFile("classes/closureWithParameter.kt"); - } - - public void testClosureWithParameterAndBoxing() { - blackBoxFile("classes/closureWithParameterAndBoxing.kt"); - } - - public void testExtensionClosure() { - blackBoxFile("classes/extensionClosure.kt"); - } - - public void testEnclosingLocalVariable() { - blackBoxFile("classes/enclosingLocalVariable.kt"); - } - - public void testDoubleEnclosedLocalVariable() { - blackBoxFile("classes/doubleEnclosedLocalVariable.kt"); - } - - public void testEnclosingThis() { - blackBoxFile("classes/enclosingThis.kt"); - } - - public void testKt2151() { - blackBoxFile("regressions/kt2151.kt"); - } - - public void testRecursiveClosure() { - blackBoxFile("classes/recursiveClosure.kt"); - } -} diff --git a/compiler/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java b/compiler/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java index 19eb5adc087..8f427b7649f 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java @@ -64,10 +64,6 @@ public class ControlStructuresTest extends CodegenTestCase { factorialTest("controlStructures/break.kt"); } - public void testInRangeConditionsInWhen() { - blackBoxFile("controlStructures/inRangeConditionsInWhen.kt"); - } - private void factorialTest(String name) throws Exception { loadFile(name); final Method main = generateFunction(); @@ -151,42 +147,6 @@ public class ControlStructuresTest extends CodegenTestCase { assertEquals("foobar", sb.toString()); } - public void testForUserType() { - blackBoxFile("controlStructures/forUserType.kt"); - } - - public void testForLoopMemberExtensionNext() { - blackBoxFile("controlStructures/forLoopMemberExtensionNext.kt"); - } - - public void testForLoopMemberExtensionHasNext() { - blackBoxFile("controlStructures/forLoopMemberExtensionHasNext.kt"); - } - - public void testForLoopMemberExtensionAll() { - blackBoxFile("controlStructures/forLoopMemberExtensionAll.kt"); - } - - public void testForIntArray() { - blackBoxFile("controlStructures/forIntArray.kt"); - } - - public void testForPrimitiveIntArray() { - blackBoxFile("controlStructures/forPrimitiveIntArray.kt"); - } - - public void testForNullableIntArray() { - blackBoxFile("controlStructures/forNullableIntArray.kt"); - } - - public void testForIntRange() { - blackBoxFile("controlStructures/forIntRange.kt"); - } - - public void testKt237() { - blackBoxFile("regressions/kt237.kt"); - } - public void testCompareToZero() throws Exception { loadText("fun foo(a: Int, b: Int): Boolean = a == 0 && b != 0 && 0 == a && 0 != b"); String text = generateToText(); @@ -202,10 +162,6 @@ public class ControlStructuresTest extends CodegenTestCase { assertEquals(false, main.invoke(null, 1, 0)); } - public void testCompareBoxedIntegerToZero() { - blackBoxFile("controlStructures/compareBoxedIntegerToZero.kt"); - } - public void testCompareToNull() throws Exception { loadText("fun foo(a: String?, b: String?): Boolean = a == null && b !== null && null == a && null !== b"); String text = generateToText(); @@ -230,144 +186,4 @@ public class ControlStructuresTest extends CodegenTestCase { assertEquals(true, main.invoke(null, null, "lala")); assertEquals(false, main.invoke(null, "papa", "papa")); } - - public void testKt299() { - blackBoxFile("regressions/kt299.kt"); - } - - public void testKt416() { - blackBoxFile("regressions/kt416.kt"); - } - - public void testKt513() { - blackBoxFile("regressions/kt513.kt"); - } - - public void testKt769() { - blackBoxFile("regressions/kt769.kt"); - } - - public void testKt773() { - blackBoxFile("regressions/kt773.kt"); - } - - public void testKt772() { - blackBoxFile("regressions/kt772.kt"); - } - - public void testKt870() { - blackBoxFile("regressions/kt870.kt"); - } - - public void testKt958() { - blackBoxFile("regressions/kt958.kt"); - } - - public void testQuicksort() { - blackBoxFile("controlStructures/quicksort.kt"); - } - - public void testKt998() { - blackBoxFile("regressions/kt998.kt"); - } - - public void testContinueInFor() { - blackBoxFile("controlStructures/continueInFor.kt"); - } - - public void testContinueToLabelInFor() { - blackBoxFile("controlStructures/continueToLabelInFor.kt"); - } - - public void testKt628() { - blackBoxFile("regressions/kt628.kt"); - } - - public void testKt1441() { - blackBoxFile("regressions/kt1441.kt"); - } - - public void testKt2147() { - blackBoxFile("regressions/kt2147.kt"); - } - - public void testIfDummy() { - blackBoxFile("regressions/kt1899.kt"); - } - - public void testKt1742() { - blackBoxFile("regressions/kt1742.kt"); - } - - public void testKt2062() { - blackBoxFile("regressions/kt2062.kt"); - } - - public void testKt910() { - blackBoxFile("regressions/kt910.kt"); - } - - public void testKt1688() { - blackBoxFile("regressions/kt1688.kt"); - } - - public void testKt2416() { - blackBoxFile("regressions/kt2416.kt"); - } - - public void testKt2291() { - blackBoxFile("regressions/kt2291.kt"); - } - - public void testKt2259() { - blackBoxFile("regressions/kt2259.kt"); - } - - public void testKt2577() { - blackBoxFile("regressions/kt2577.kt"); - } - - public void testTryCatchFinallyChain() { - blackBoxFile("controlStructures/tryCatchFinallyChain.kt"); - } - - public void testKt2597() { - blackBoxFile("regressions/kt2597.kt"); - } - - public void testKt2598() { - blackBoxFile("regressions/kt2598.kt"); - } - - public void testLongRange() { - blackBoxFile("controlStructures/longRange.kt"); - } - - public void testForInSmartCastedToArray() { - blackBoxFile("controlStructures/forInSmartCastedToArray.kt"); - } - - public void testConditionOfEmptyIf() { - blackBoxFile("controlStructures/conditionOfEmptyIf.kt"); - } - - public void testFinallyOnEmptyReturn() { - blackBoxFile("controlStructures/finallyOnEmptyReturn.kt"); - } - - public void testKt3087() { - blackBoxFile("regressions/kt3087.kt"); - } - - public void testKt3203_1() { - blackBoxFile("regressions/kt3203_1.kt"); - } - - public void testKt3203_2() { - blackBoxFile("regressions/kt3203_2.kt"); - } - - public void testKt3273() { - blackBoxFile("regressions/kt3273.kt"); - } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/EnumGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/EnumGenTest.java index f8d13016343..b4874e0f4c0 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/EnumGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/EnumGenTest.java @@ -64,42 +64,6 @@ public class EnumGenTest extends CodegenTestCase { final Method rgbMethod = colorClass.getMethod("getRgb"); assertEquals(0xFF0000, rgbMethod.invoke(redValue)); } - - public void testSimple() { - blackBoxFile("enum/simple.kt"); - } - - public void testSimpleEnumInPackage() { - blackBoxFile("enum/inPackage.kt"); - } - - public void testAsReturnExpression() { - blackBoxFile("enum/asReturnExpression.kt"); - } - - public void testToString() { - blackBoxFile("enum/toString.kt"); - } - - public void testName() { - blackBoxFile("enum/name.kt"); - } - - public void testOrdinal() { - blackBoxFile("enum/ordinal.kt"); - } - - public void testValues() { - blackBoxFile("enum/valueof.kt"); - } - - public void testInClassObj() { - blackBoxFile("enum/inclassobj.kt"); - } - - public void testAbstractMethod() { - blackBoxFile("enum/abstractmethod.kt"); - } public void testSimpleJavaEnum() throws Exception { blackBoxFileWithJava("enum/simpleJavaEnum.kt"); @@ -142,36 +106,4 @@ public class EnumGenTest extends CodegenTestCase { catch (ClassNotFoundException e) { } } - - public void testKt1119() { - blackBoxFile("regressions/kt1119.kt"); - } - - public void testKt2350() { - blackBoxFile("regressions/kt2350.kt"); - } - - public void testEntryWithInner() { - blackBoxFile("enum/entrywithinner.kt"); - } - - public void testInner() { - blackBoxFile("enum/inner.kt"); - } - - public void testInFunction() { - blackBoxFile("enum/inFunction.kt"); - } - - public void testInnerWithExistingClassObject() { - blackBoxFile("enum/innerWithExistingClassObject.kt"); - } - - public void testAbstractMethodInEnum() { - blackBoxFile("enum/abstractMethodInEnum.kt"); - } - - public void testKt2673() { - blackBoxFile("regressions/kt2673.kt"); - } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/ExtensionFunctionsTest.java b/compiler/tests/org/jetbrains/jet/codegen/ExtensionFunctionsTest.java index 7e88fc55ea4..eafbfa1ab70 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/ExtensionFunctionsTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/ExtensionFunctionsTest.java @@ -48,48 +48,4 @@ public class ExtensionFunctionsTest extends CodegenTestCase { Method foo = generateFunction("foo"); assertThrows(foo, Exception.class, null, new StringBuilder()); } - - public void testVirtual() { - blackBoxFile("extensionFunctions/virtual.kt"); - } - - public void testShared() { - blackBoxFile("extensionFunctions/shared.kt"); - } - - public void testKt475() { - blackBoxFile("regressions/kt475.kt"); - } - - public void testKt865() { - blackBoxFile("regressions/kt865.kt"); - } - - public void testKtNested2() { - blackBoxFile("extensionFunctions/nested2.kt"); - } - - public void testKt606() { - blackBoxFile("regressions/kt606.kt"); - } - - public void testKt1061() { - blackBoxFile("regressions/kt1061.kt"); - } - - public void testKt1249() { - blackBoxFile("regressions/kt1249.kt"); - } - - public void testKt1290() { - blackBoxFile("regressions/kt1290.kt"); - } - - public void testKt1953() { - blackBoxFile("regressions/kt1953.kt"); - } - - public void testKt1953Class() { - blackBoxFile("regressions/kt1953_class.kt"); - } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java index ad92d75d26c..aec2453d932 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java @@ -29,46 +29,6 @@ public class FunctionGenTest extends CodegenTestCase { createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY); } - public void testKt2716() { - blackBoxFile("regressions/kt2716.kt"); - } - - public void testDefaultArgs() { - blackBoxFile("functions/defaultargs.kt"); - } - - public void testDefaultArgs1() { - blackBoxFile("functions/defaultargs1.kt"); - } - - public void testDefaultArgs2() { - blackBoxFile("functions/defaultargs2.kt"); - } - - public void testDefaultArgs3() { - blackBoxFile("functions/defaultargs3.kt"); - } - - public void testDefaultArgs4() { - blackBoxFile("functions/defaultargs4.kt"); - } - - public void testDefaultArgs5() { - blackBoxFile("functions/defaultargs5.kt"); - } - - public void testDefaultArgs6() { - blackBoxFile("functions/defaultargs6.kt"); - } - - public void testDefaultArgs7() { - blackBoxFile("functions/defaultargs7.kt"); - } - - public void testNoThisNoClosure() { - blackBoxFile("functions/nothisnoclosure.kt"); - } - public void testAnyEqualsNullable() throws InvocationTargetException, IllegalAccessException { loadText("fun foo(x: Any?) = x.equals(\"lala\")"); Method foo = generateFunction(); @@ -95,74 +55,6 @@ public class FunctionGenTest extends CodegenTestCase { assertFalse((Boolean) foo.invoke(null, "mama")); } - public void testKt395() { - blackBoxFile("regressions/kt395.kt"); - } - - public void testKt785() { - blackBoxFile("regressions/kt785.kt"); - } - - public void testKt873() { - blackBoxFile("regressions/kt873.kt"); - } - - public void testKt1413() { - blackBoxFile("regressions/kt1413.kt"); - } - - public void testKt1199() { - blackBoxFile("regressions/kt1199.kt"); - } - - public void testFunction() { - blackBoxFile("functions/functionExpression.kt"); - } - - public void testLocalFunction() { - blackBoxFile("functions/localFunction.kt"); - } - - public void testInvoke() { - blackBoxFile("functions/invoke.kt"); - } - - public void testKt2481() { - blackBoxFile("regressions/kt2481.kt"); - } - - public void testKt2280() { - blackBoxFile("regressions/kt2280.kt"); - } - - public void testKt1739() { - blackBoxFile("regressions/kt1739.kt"); - } - - public void testKt2271() { - blackBoxFile("regressions/kt2271.kt"); - } - - public void testKt2270() { - blackBoxFile("regressions/kt2270.kt"); - } - - public void testK1649_1() { - blackBoxFile("regressions/kt1649_1.kt"); - } - - public void testK1649_2() { - blackBoxFile("regressions/kt1649_2.kt"); - } - - public void testKt1038() { - blackBoxFile("regressions/kt1038.kt"); - } - - public void testKt2739() { - blackBoxFile("regressions/kt2739.kt"); - } - public void testReferencesStaticInnerClassMethod() throws Exception { blackBoxFileWithJava("functions/referencesStaticInnerClassMethod.kt"); } @@ -175,18 +67,10 @@ public class FunctionGenTest extends CodegenTestCase { blackBoxFileWithJava("functions/removeInIterator.kt"); } - public void testKt2929() { - blackBoxFile("regressions/kt2929.kt"); - } - public void testPrivateDefaultArgs() throws Exception { loadFile("functions/privateDefaultArgs.kt"); String text = generateToText(); assertFalse(text.contains("INVOKEVIRTUAL")); assertTrue(text.contains("INVOKESPECIAL")); } - - public void testEa33909() { - blackBoxFile("regressions/ea33909.kt"); - } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/LocalClassGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/LocalClassGenTest.java deleted file mode 100644 index c119ac15ea3..00000000000 --- a/compiler/tests/org/jetbrains/jet/codegen/LocalClassGenTest.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2010-2012 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.codegen; - -import org.jetbrains.jet.ConfigurationKind; - -public class LocalClassGenTest extends CodegenTestCase { - @Override - public void setUp() throws Exception { - super.setUp(); - createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY); - } - - public void testNoClosure() { - blackBoxFile("localcls/noclosure.kt"); - } - - public void testWithClosure() { - blackBoxFile("localcls/withclosure.kt"); - } - - public void testEnum() { - blackBoxFile("localcls/enum.kt"); - } - - public void testObject() { - blackBoxFile("localcls/object.kt"); - } -} diff --git a/compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java index b9fa937a904..b01712f8d0e 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java @@ -435,24 +435,12 @@ public class NamespaceGenTest extends CodegenTestCase { assertEquals('x', ((Character) main.invoke(null, sb)).charValue()); } - public void testNamespaceQualifiedMethod() throws Exception { - blackBoxFile("namespaceQualifiedMethod.kt"); - } - - public void testCheckCast() throws Exception { - blackBoxFile("checkCast.kt"); - } - public void testPutBooleanAsVoid() throws Exception { loadText("class C(val x: Int) { { x > 0 } } fun box() { val c = C(0) } "); final Method main = generateFunction(); main.invoke(null); // must not fail } - public void testIncrementProperty() throws Exception { - blackBoxFile("incrementProperty.kt"); - } - public void testJavaInterfaceMethod() throws Exception { loadText("import java.util.*; fun foo(l: ArrayList) { l.add(\"foo\") }"); final Method main = generateFunction(); @@ -507,12 +495,4 @@ public class NamespaceGenTest extends CodegenTestCase { //noinspection ImplicitArrayToString assertEquals("s" + args.toString(), main.invoke(null, "s", args)); } - - public void testPrivateTopLevelPropAndVarInInner() { - blackBoxFile("privateTopLevelPropAndVarInInner.kt"); - } - - public void testInvokeSpecial() { - blackBoxFile("invokespecial.kt"); - } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/ObjectGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/ObjectGenTest.java deleted file mode 100644 index faffca85365..00000000000 --- a/compiler/tests/org/jetbrains/jet/codegen/ObjectGenTest.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Copyright 2010-2012 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.codegen; - -import org.jetbrains.jet.ConfigurationKind; - -public class ObjectGenTest extends CodegenTestCase { - @Override - protected void setUp() throws Exception { - super.setUp(); - createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY); - } - - public void testSimpleObject() { - blackBoxFile("objects/simpleObject.kt"); - } - - public void testObjectLiteral() { - blackBoxFile("objects/objectLiteral.kt"); - } - - public void testObjectLiteralInClosure() { - blackBoxFile("objects/objectLiteralInClosure.kt"); - } - - public void testMethodOnObject() { - blackBoxFile("objects/methodOnObject.kt"); - } - - public void testKt535() { - blackBoxFile("regressions/kt535.kt"); - } - - public void testKt560() { - blackBoxFile("regressions/kt560.kt"); - } - - public void testKt640() { - blackBoxFile("regressions/kt640.kt"); - } - - public void testKt1136() { - blackBoxFile("regressions/kt1136.kt"); - } - - public void testKt1047() { - blackBoxFile("regressions/kt1047.kt"); - } - - public void testKt694() { - blackBoxFile("regressions/kt694.kt"); - } - - public void testKt1186() { - blackBoxFile("regressions/kt1186.kt"); - } - - public void testKt1600() { - blackBoxFile("regressions/kt1600.kt"); - } - - public void testKt1737() { - blackBoxFile("regressions/kt1737.kt"); - } - - public void testK2719() { - blackBoxFile("regressions/kt2719.kt"); - } - - public void testReceiverInConstructor() { - blackBoxFile("objects/receiverInConstructor.kt"); - } - - public void testThisInConstructor() { - blackBoxFile("objects/thisInConstructor.kt"); - } - - public void testFlist() { - blackBoxFile("objects/flist.kt"); - } - - public void testKt2398() { - blackBoxFile("regressions/kt2398.kt"); - } - - public void testKt2675() { - blackBoxFile("regressions/kt2675.kt"); - } - - public void testKt2663() { - blackBoxFile("regressions/kt2663.kt"); - } - - public void testKt2663_2() { - blackBoxFile("regressions/kt2663_2.kt"); - } - - public void testKt2822() { - blackBoxFile("regressions/kt2822.kt"); - } - - public void testKt3238() { - blackBoxFile("regressions/kt3238.kt"); - } -} diff --git a/compiler/tests/org/jetbrains/jet/codegen/PatternMatchingTest.java b/compiler/tests/org/jetbrains/jet/codegen/PatternMatchingTest.java index b3fa81473b8..c9268fd636e 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/PatternMatchingTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/PatternMatchingTest.java @@ -68,22 +68,6 @@ public class PatternMatchingTest extends CodegenTestCase { assertEquals("something", foo.invoke(null, 19)); } - public void testIs() { - blackBoxFile("patternMatching/is.kt"); - } - - public void testRange() { - blackBoxFile("patternMatching/range.kt"); - } - - public void testLongInRange() { - blackBoxFile("patternMatching/longInRange.kt"); - } - - public void testWhenArgumentIsEvaluatedOnlyOnce() { - blackBoxFile("patternMatching/whenArgumentIsEvaluatedOnlyOnce.kt"); - } - public void testRangeChar() throws Exception { loadFile(); Method foo = generateFunction(); @@ -110,10 +94,6 @@ public class PatternMatchingTest extends CodegenTestCase { assertEquals("something", foo.invoke(null, "C#")); } - public void testCallProperty() { - blackBoxFile("patternMatching/callProperty.kt"); - } - public void testMultipleConditions() throws Exception { loadText("fun foo(x: Any) = when(x) { 0, 1 -> \"bit\"; else -> \"something\" }"); Method foo = generateFunction(); @@ -121,20 +101,4 @@ public class PatternMatchingTest extends CodegenTestCase { assertEquals("bit", foo.invoke(null, 1)); assertEquals("something", foo.invoke(null, 2)); } - - public void testNullableWhen() { - blackBoxFile("patternMatching/nullableWhen.kt"); - } - - public void testKt2466() { - blackBoxFile("patternMatching/kt2466.kt"); - } - - public void testMatchNotNullAgainstNullable() { - blackBoxFile("patternMatching/matchNotNullAgainstNullable.kt"); - } - - public void testKt2457() { - blackBoxFile("regressions/kt2457.kt"); - } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java b/compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java index 8f00993f9a9..efea6871d7c 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java @@ -272,38 +272,6 @@ public class PrimitiveTypesTest extends CodegenTestCase { assertEquals(expected, main.invoke(null, arg1, arg2)); } - public void testEa35963() { - blackBoxFile("regressions/ea35963.kt"); - } - - public void testKt242 () throws Exception { - blackBoxFile("regressions/kt242.kt"); - } - - public void testKt239 () throws Exception { - blackBoxFile("regressions/kt239.kt"); - } - - public void testKt243 () throws Exception { - blackBoxFile("regressions/kt243.kt"); - } - - public void testKt248 () throws Exception { - blackBoxFile("regressions/kt248.kt"); - } - - public void testKt446 () throws Exception { - blackBoxFile("regressions/kt446.kt"); - } - - public void testKt518 () throws Exception { - blackBoxFile("regressions/kt518.kt"); - } - - public void testKt711() { - blackBoxFile("primitiveTypes/kt711.kt"); - } - public void testSureNonnull () throws Exception { loadText("fun box() = 10!!.toString()"); assertFalse(generateToText().contains("IFNONNULL")); @@ -323,124 +291,4 @@ public class PrimitiveTypesTest extends CodegenTestCase { loadText("val a : Int? = 10; fun box() = a?.toString()"); assertTrue(generateToText().contains("IFNULL")); } - - public void testKt737() { - blackBoxFile("primitiveTypes/kt737.kt"); - } - - public void testKt665() { - blackBoxFile("primitiveTypes/kt665.kt"); - } - - public void testKt752 () { - blackBoxFile("regressions/kt752.kt"); - } - - public void testKt753 () { - blackBoxFile("regressions/kt753.kt"); - } - - public void testKt684 () { - blackBoxFile("regressions/kt684.kt"); - } - - public void testKt756 () { - blackBoxFile("regressions/kt756.kt"); - } - - public void testKt757 () { - blackBoxFile("regressions/kt757.kt"); - } - - public void testKt877 () { - blackBoxFile("regressions/kt877.kt"); - } - - public void testKt882 () { - blackBoxFile("regressions/kt882.kt"); - } - - public void testKt887 () { - blackBoxFile("regressions/kt887.kt"); - } - - public void testKt821 () { - blackBoxFile("regressions/kt821.kt"); - } - - public void testKt925 () { - blackBoxFile("regressions/kt925.kt"); - } - - public void testKt765 () { - blackBoxFile("regressions/kt765.kt"); - } - - public void testKt944 () { - blackBoxFile("regressions/kt944.kt"); - } - - public void testKt945 () { - blackBoxFile("regressions/kt945.kt"); - } - - public void testKt935 () { - blackBoxFile("regressions/kt935.kt"); - } - - public void testKt1055 () { - blackBoxFile("regressions/kt1055.kt"); - } - - public void testKt1054 () { - blackBoxFile("regressions/kt1054.kt"); - } - - public void testKt1093 () { - blackBoxFile("regressions/kt1093.kt"); - } - - public void testKt1508 () { - blackBoxFile("regressions/kt1508.kt"); - } - - public void testKt1634() { - blackBoxFile("regressions/kt1634.kt"); - } - - public void testKt2269() { - blackBoxFile("regressions/kt2269.kt"); - } - - public void testKt2275() { - blackBoxFile("regressions/kt2275.kt"); - } - - public void testEmptyRanges() throws Exception { - blackBoxFile("emptyRanges.kt"); - } - - public void test2251() throws Exception { - blackBoxFile("regressions/kt2251.kt"); - } - - public void test2794() throws Exception { - blackBoxFile("regressions/kt2794.kt"); - } - - public void testUnboxComparable() { - blackBoxFile("primitiveTypes/unboxComparable.kt"); - } - - public void testKt3078() { - blackBoxFile("regressions/kt3078.kt"); - } - - public void testIntLiteralIsNotNull() { - blackBoxFile("primitiveTypes/intLiteralIsNotNull.kt"); - } - - public void testNullAsNullableIntIsNull() { - blackBoxFile("primitiveTypes/nullAsNullableIntIsNull.kt"); - } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java index 7a2607c6fb0..3c006f2180c 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java @@ -166,14 +166,6 @@ public class PropertyGenTest extends CodegenTestCase { assertTrue((x.getModifiers() & Modifier.VOLATILE) != 0); } - public void testKt257() { - blackBoxFile("regressions/kt257.kt"); - } - - public void testKt613() { - blackBoxFile("regressions/kt613.kt"); - } - public void testKt160() throws Exception { loadText("internal val s = java.lang.Double.toString(1.0)"); final Method method = generateFunction("getS"); @@ -181,38 +173,6 @@ public class PropertyGenTest extends CodegenTestCase { assertEquals(method.invoke(null), "1.0"); } - public void testKt1165() { - blackBoxFile("regressions/kt1165.kt"); - } - - public void testKt1168() { - blackBoxFile("regressions/kt1168.kt"); - } - - public void testKt1170() { - blackBoxFile("regressions/kt1170.kt"); - } - - public void testKt1159() { - blackBoxFile("regressions/kt1159.kt"); - } - - public void testKt1417() { - blackBoxFile("regressions/kt1417.kt"); - } - - public void testKt1398() { - blackBoxFile("regressions/kt1398.kt"); - } - - public void testKt2331() { - blackBoxFile("regressions/kt2331.kt"); - } - - public void testKt1892() { - blackBoxFile("regressions/kt1892.kt"); - } - public void testKt1846() { loadFile("regressions/kt1846.kt"); final Class aClass = generateClass("A"); @@ -233,26 +193,6 @@ public class PropertyGenTest extends CodegenTestCase { } } - public void testKt1482_2279() { - blackBoxFile("regressions/kt1482_2279.kt"); - } - - public void testKt1714() { - blackBoxFile("regressions/kt1714.kt"); - } - - public void testKt1714_minimal() { - blackBoxFile("regressions/kt1714_minimal.kt"); - } - - public void testKt2786() { - blackBoxFile("regressions/kt2786.kt"); - } - - public void testKt2655() { - blackBoxFile("regressions/kt2655.kt"); - } - public void testKt1528() { blackBoxMultiFile("regressions/kt1528_1.kt", "regressions/kt1528_3.kt"); } @@ -324,18 +264,6 @@ public class PropertyGenTest extends CodegenTestCase { } } - public void testKt2892() { - blackBoxFile("properties/kt2892.kt"); - } - - public void testAccessToPrivateProperty() { - blackBoxFile("properties/accessToPrivateProperty.kt"); - } - - public void testAccessToPrivateSetter() { - blackBoxFile("properties/accessToPrivateSetter.kt"); - } - public void testKt2202() { loadFile("properties/kt2202.kt"); String text = generateToText(); diff --git a/compiler/tests/org/jetbrains/jet/codegen/SafeRefTest.java b/compiler/tests/org/jetbrains/jet/codegen/SafeRefTest.java deleted file mode 100644 index a4edacd7c6c..00000000000 --- a/compiler/tests/org/jetbrains/jet/codegen/SafeRefTest.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2010-2012 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.codegen; - -import org.jetbrains.jet.ConfigurationKind; - -public class SafeRefTest extends CodegenTestCase { - @Override - protected void setUp() throws Exception { - super.setUp(); - createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY); - } - - public void test247() { - blackBoxFile("regressions/kt247.kt"); - } - - public void test245() { - blackBoxFile("regressions/kt245.kt"); - } - - public void test232() { - blackBoxFile("regressions/kt232.kt"); - } - - public void test1572() { - blackBoxFile("regressions/kt1572.kt"); - } -} diff --git a/compiler/tests/org/jetbrains/jet/codegen/StringsTest.java b/compiler/tests/org/jetbrains/jet/codegen/StringsTest.java index fbcf89f6d08..dded62947fe 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/StringsTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/StringsTest.java @@ -64,28 +64,4 @@ public class StringsTest extends CodegenTestCase { assertEquals("239null120", foo.invoke(null, "239", null)); } - - public void testRawStrings() throws Exception { - blackBoxFile("rawStrings.kt"); - } - - public void testMultilineStringsWithTemplates() throws Exception { - blackBoxFile("multilineStringsWithTemplates.kt"); - } - - public void testKt881() throws Exception { - blackBoxFile("regressions/kt881.kt"); - } - - public void testKt894() throws Exception { - blackBoxFile("regressions/kt894.kt"); - } - - public void testKt889() throws Exception { - blackBoxFile("regressions/kt889.kt"); - } - - public void testEa35743() { - blackBoxFile("regressions/ea35743.kt"); - } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/SuperGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/SuperGenTest.java index 6e146de4de8..ea65e560f07 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/SuperGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/SuperGenTest.java @@ -27,42 +27,6 @@ public class SuperGenTest extends CodegenTestCase { createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY); } - public void testBasicProperty () { - blackBoxFile("/super/basicproperty.kt"); - } - - public void testTraitProperty () { - blackBoxFile("/super/traitproperty.kt"); - } - - public void testBasicMethodSuperTrait () { - blackBoxFile("/super/basicmethodSuperTrait.kt"); - } - - public void testBasicMethodSuperClass () { - blackBoxFile("/super/basicmethodSuperClass.kt"); - } - - public void testInnerClassLabeledSuper() { - blackBoxFile("super/innerClassLabeledSuper.kt"); - } - - public void testInnerClassLabeledSuperProperty() { - blackBoxFile("super/innerClassLabeledSuperProperty.kt"); - } - - public void testMultipleSuperTraits() { - blackBoxFile("super/multipleSuperTraits.kt"); - } - - public void testEnclosedFun () { - blackBoxFile("/super/enclosedFun.kt"); - } - - public void testEnclosedVar () { - blackBoxFile("/super/enclosedVar.kt"); - } - public void testKt2887() { loadFile("super/kt2887.kt"); String text = generateToText(); diff --git a/compiler/tests/org/jetbrains/jet/codegen/TraitsTest.java b/compiler/tests/org/jetbrains/jet/codegen/TraitsTest.java deleted file mode 100644 index d802829aa4f..00000000000 --- a/compiler/tests/org/jetbrains/jet/codegen/TraitsTest.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright 2010-2012 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.codegen; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; - -public class TraitsTest extends CodegenTestCase { - - @Override - protected void setUp() throws Exception { - super.setUp(); - createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY); - } - - @NotNull - @Override - protected String getPrefix() { - return "traits"; - } - - public void testSimple () { - blackBoxFile("traits/simple.kt"); - } - - public void testWithRequired () { - blackBoxFile("traits/withRequired.kt"); - } - - public void testMultiple () { - blackBoxFile("traits/multiple.kt"); - } - - public void testStdlib () { - blackBoxFile("traits/stdlib.kt"); - } - - public void testInheritedFun() { - blackBoxFile("traits/inheritedFun.kt"); - } - - public void testInheritedVar() { - blackBoxFile("traits/inheritedVar.kt"); - } - - public void testKt2399() { - blackBoxFile("regressions/kt2399.kt"); - } - - public void testTraitFuncCall() { - blackBoxFile("traits/traitFuncCall.kt"); - } - - public void testKt2541() { - blackBoxFile("regressions/kt2541.kt"); - } - - public void testKt2260() { - blackBoxFile("regressions/kt2260.kt"); - } - - public void testFinalMethod() throws Exception { - blackBoxFile("traits/finalMethod.kt"); - } - - public void testKt1936_1() throws Exception { - blackBoxFile("regressions/kt1936_1.kt"); - } - - public void testKt1936_2() throws Exception { - blackBoxFile("regressions/kt1936_2.kt"); - } - - public void testKt2963() { - blackBoxFile("regressions/kt2963.kt"); - } - - public void testWithRequiredSuper() { - blackBoxFile("traits/withRequiredSuper.kt"); - } - - public void testWithRequiredSuperViaBridge() { - blackBoxFile("traits/withRequiredSuperViaBridge.kt"); - } -} diff --git a/compiler/tests/org/jetbrains/jet/codegen/TupleGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/TupleGenTest.java deleted file mode 100644 index a4fbcc4ebbd..00000000000 --- a/compiler/tests/org/jetbrains/jet/codegen/TupleGenTest.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2010-2012 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.codegen; - -import org.jetbrains.jet.ConfigurationKind; - -public class TupleGenTest extends CodegenTestCase { - - public void testUnitValue() { - createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY); - blackBoxFile("/tuples/UnitValue.kt"); - } -} diff --git a/compiler/tests/org/jetbrains/jet/codegen/TypeInfoTest.java b/compiler/tests/org/jetbrains/jet/codegen/TypeInfoTest.java index ab96888fa4f..e61cbf7a5ff 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/TypeInfoTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/TypeInfoTest.java @@ -66,14 +66,6 @@ public class TypeInfoTest extends CodegenTestCase { assertFalse((Boolean) foo.invoke(null, newRunnable())); } - public void testAsInLoop() { - blackBoxFile("typeInfo/asInLoop.kt"); - } - - public void testPrimitiveTypeInfo() { - blackBoxFile("typeInfo/primitiveTypeInfo.kt"); - } - private Runnable newRunnable() { return new Runnable() { @Override @@ -81,16 +73,4 @@ public class TypeInfoTest extends CodegenTestCase { } }; } - - public void testKt511() { - blackBoxFile("regressions/kt511.kt"); - } - - public void testKt2811() { - blackBoxFile("typeInfo/kt2811.kt"); - } - - public void testInheritance() { - blackBoxFile("typeInfo/inheritance.kt"); - } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java b/compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java index 5e4d43be2fb..7e0db3a9dbf 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java @@ -85,14 +85,6 @@ public class VarArgTest extends CodegenTestCase { assertTrue(((Integer[])res)[1].equals(4)); } - public void testKt581() { - blackBoxFile("regressions/kt581.kt"); - } - - public void testKt797() { - blackBoxFile("regressions/kt796_797.kt"); - } - public void testArrayAsVararg() throws InvocationTargetException, IllegalAccessException { loadText("private fun asList(vararg elems: String) = elems; fun test(ts: Array) = asList(*ts); "); final Method main = generateFunction("test"); @@ -109,8 +101,4 @@ public class VarArgTest extends CodegenTestCase { assertEquals("mama", Array.get(invoke, 0)); assertEquals("papa", Array.get(invoke, 1)); } - - public void testKt1978() { - blackBoxFile("regressions/kt1978.kt"); - } }