diff --git a/compiler/testData/codegen/dataClasses/arrayParams.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/arrayParams.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/arrayParams.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/arrayParams.kt diff --git a/compiler/testData/codegen/dataClasses/changingVarParam.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/changingVarParam.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/changingVarParam.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/changingVarParam.kt diff --git a/compiler/testData/codegen/dataClasses/copy/constructorWithDefaultParam.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/copy/constructorWithDefaultParam.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/copy/constructorWithDefaultParam.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/copy/constructorWithDefaultParam.kt diff --git a/compiler/testData/codegen/dataClasses/copy/copyInNestedDataClass.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/copy/copyInNestedDataClass.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/copy/copyInNestedDataClass.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/copy/copyInNestedDataClass.kt diff --git a/compiler/testData/codegen/dataClasses/copy/copyInObjectNestedDataClass.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/copy/copyInObjectNestedDataClass.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/copy/copyInObjectNestedDataClass.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/copy/copyInObjectNestedDataClass.kt diff --git a/compiler/testData/codegen/dataClasses/copy/kt3033.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/copy/kt3033.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/copy/kt3033.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/copy/kt3033.kt diff --git a/compiler/testData/codegen/dataClasses/copy/paramWithoutProperty.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/copy/paramWithoutProperty.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/copy/paramWithoutProperty.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/copy/paramWithoutProperty.kt diff --git a/compiler/testData/codegen/dataClasses/copy/valInConstructorParams.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/copy/valInConstructorParams.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/copy/valInConstructorParams.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/copy/valInConstructorParams.kt diff --git a/compiler/testData/codegen/dataClasses/copy/varInConstructorParams.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/copy/varInConstructorParams.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/copy/varInConstructorParams.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/copy/varInConstructorParams.kt diff --git a/compiler/testData/codegen/dataClasses/copy/withGenericParameter.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/copy/withGenericParameter.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/copy/withGenericParameter.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/copy/withGenericParameter.kt diff --git a/compiler/testData/codegen/dataClasses/equals/alreadyDeclared.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/equals/alreadyDeclared.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/equals/alreadyDeclared.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/equals/alreadyDeclared.kt diff --git a/compiler/testData/codegen/dataClasses/equals/alreadyDeclaredWrongSignature.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/equals/alreadyDeclaredWrongSignature.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/equals/alreadyDeclaredWrongSignature.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/equals/alreadyDeclaredWrongSignature.kt diff --git a/compiler/testData/codegen/dataClasses/equals/genericarray.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/equals/genericarray.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/equals/genericarray.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/equals/genericarray.kt diff --git a/compiler/testData/codegen/dataClasses/equals/instanceof.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/equals/instanceof.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/equals/instanceof.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/equals/instanceof.kt diff --git a/compiler/testData/codegen/dataClasses/equals/intarray.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/equals/intarray.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/equals/intarray.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/equals/intarray.kt diff --git a/compiler/testData/codegen/dataClasses/equals/nullother.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/equals/nullother.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/equals/nullother.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/equals/nullother.kt diff --git a/compiler/testData/codegen/dataClasses/equals/sameinstance.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/equals/sameinstance.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/equals/sameinstance.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/equals/sameinstance.kt diff --git a/compiler/testData/codegen/dataClasses/genericParam.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/genericParam.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/genericParam.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/genericParam.kt diff --git a/compiler/testData/codegen/dataClasses/hashcode/alreadyDeclared.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/alreadyDeclared.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/hashcode/alreadyDeclared.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/alreadyDeclared.kt diff --git a/compiler/testData/codegen/dataClasses/hashcode/alreadyDeclaredWrongSignature.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/alreadyDeclaredWrongSignature.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/hashcode/alreadyDeclaredWrongSignature.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/alreadyDeclaredWrongSignature.kt diff --git a/compiler/testData/codegen/dataClasses/hashcode/array.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/array.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/hashcode/array.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/array.kt diff --git a/compiler/testData/codegen/dataClasses/hashcode/boolean.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/boolean.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/hashcode/boolean.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/boolean.kt diff --git a/compiler/testData/codegen/dataClasses/hashcode/byte.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/byte.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/hashcode/byte.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/byte.kt diff --git a/compiler/testData/codegen/dataClasses/hashcode/char.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/char.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/hashcode/char.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/char.kt diff --git a/compiler/testData/codegen/dataClasses/hashcode/double.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/double.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/hashcode/double.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/double.kt diff --git a/compiler/testData/codegen/dataClasses/hashcode/float.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/float.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/hashcode/float.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/float.kt diff --git a/compiler/testData/codegen/dataClasses/hashcode/genericNull.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/genericNull.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/hashcode/genericNull.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/genericNull.kt diff --git a/compiler/testData/codegen/dataClasses/hashcode/int.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/int.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/hashcode/int.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/int.kt diff --git a/compiler/testData/codegen/dataClasses/hashcode/long.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/long.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/hashcode/long.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/long.kt diff --git a/compiler/testData/codegen/dataClasses/hashcode/null.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/null.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/hashcode/null.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/null.kt diff --git a/compiler/testData/codegen/dataClasses/hashcode/short.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/short.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/hashcode/short.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/short.kt diff --git a/compiler/testData/codegen/dataClasses/mixedParams.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/mixedParams.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/mixedParams.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/mixedParams.kt diff --git a/compiler/testData/codegen/dataClasses/multiDeclaration.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/multiDeclaration.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/multiDeclaration.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/multiDeclaration.kt diff --git a/compiler/testData/codegen/dataClasses/multiDeclarationFor.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/multiDeclarationFor.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/multiDeclarationFor.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/multiDeclarationFor.kt diff --git a/compiler/testData/codegen/dataClasses/overriddenProperty.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/overriddenProperty.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/overriddenProperty.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/overriddenProperty.kt diff --git a/compiler/testData/codegen/dataClasses/tostring/alreadyDeclared.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyDeclared.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/tostring/alreadyDeclared.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyDeclared.kt diff --git a/compiler/testData/codegen/dataClasses/tostring/alreadyDeclaredWrongSignature.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyDeclaredWrongSignature.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/tostring/alreadyDeclaredWrongSignature.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyDeclaredWrongSignature.kt diff --git a/compiler/testData/codegen/dataClasses/tostring/arrayParams.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/arrayParams.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/tostring/arrayParams.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/arrayParams.kt diff --git a/compiler/testData/codegen/dataClasses/tostring/changingVarParam.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/changingVarParam.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/tostring/changingVarParam.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/changingVarParam.kt diff --git a/compiler/testData/codegen/dataClasses/tostring/genericParam.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/genericParam.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/tostring/genericParam.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/genericParam.kt diff --git a/compiler/testData/codegen/dataClasses/tostring/mixedParams.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/mixedParams.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/tostring/mixedParams.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/mixedParams.kt diff --git a/compiler/testData/codegen/dataClasses/tostring/overriddenProperty.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/overriddenProperty.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/tostring/overriddenProperty.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/overriddenProperty.kt diff --git a/compiler/testData/codegen/dataClasses/tostring/unitComponent.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/unitComponent.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/tostring/unitComponent.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/unitComponent.kt diff --git a/compiler/testData/codegen/dataClasses/twoValParams.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/twoValParams.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/twoValParams.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/twoValParams.kt diff --git a/compiler/testData/codegen/dataClasses/twoVarParams.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/twoVarParams.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/twoVarParams.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/twoVarParams.kt diff --git a/compiler/testData/codegen/dataClasses/unitComponent.kt b/compiler/testData/codegen/boxWithStdlib/dataClasses/unitComponent.kt similarity index 100% rename from compiler/testData/codegen/dataClasses/unitComponent.kt rename to compiler/testData/codegen/boxWithStdlib/dataClasses/unitComponent.kt diff --git a/compiler/testData/codegen/ranges/expression/emptyDownto.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyDownto.kt similarity index 100% rename from compiler/testData/codegen/ranges/expression/emptyDownto.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyDownto.kt diff --git a/compiler/testData/codegen/ranges/expression/emptyRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyRange.kt similarity index 100% rename from compiler/testData/codegen/ranges/expression/emptyRange.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyRange.kt diff --git a/compiler/testData/codegen/ranges/expression/inexactSteppedDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedDownTo.kt similarity index 100% rename from compiler/testData/codegen/ranges/expression/inexactSteppedDownTo.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedDownTo.kt diff --git a/compiler/testData/codegen/ranges/expression/inexactSteppedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedRange.kt similarity index 100% rename from compiler/testData/codegen/ranges/expression/inexactSteppedRange.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedRange.kt diff --git a/compiler/testData/codegen/ranges/expression/oneElementDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementDownTo.kt similarity index 100% rename from compiler/testData/codegen/ranges/expression/oneElementDownTo.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementDownTo.kt diff --git a/compiler/testData/codegen/ranges/expression/oneElementRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementRange.kt similarity index 100% rename from compiler/testData/codegen/ranges/expression/oneElementRange.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementRange.kt diff --git a/compiler/testData/codegen/ranges/expression/reversedBackSequence.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedBackSequence.kt similarity index 100% rename from compiler/testData/codegen/ranges/expression/reversedBackSequence.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedBackSequence.kt diff --git a/compiler/testData/codegen/ranges/expression/reversedEmptyBackSequence.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyBackSequence.kt similarity index 100% rename from compiler/testData/codegen/ranges/expression/reversedEmptyBackSequence.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyBackSequence.kt diff --git a/compiler/testData/codegen/ranges/expression/reversedEmptyRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyRange.kt similarity index 100% rename from compiler/testData/codegen/ranges/expression/reversedEmptyRange.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyRange.kt diff --git a/compiler/testData/codegen/ranges/expression/reversedInexactSteppedDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedInexactSteppedDownTo.kt similarity index 100% rename from compiler/testData/codegen/ranges/expression/reversedInexactSteppedDownTo.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedInexactSteppedDownTo.kt diff --git a/compiler/testData/codegen/ranges/expression/reversedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedRange.kt similarity index 100% rename from compiler/testData/codegen/ranges/expression/reversedRange.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedRange.kt diff --git a/compiler/testData/codegen/ranges/expression/reversedSimpleSteppedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedSimpleSteppedRange.kt similarity index 100% rename from compiler/testData/codegen/ranges/expression/reversedSimpleSteppedRange.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedSimpleSteppedRange.kt diff --git a/compiler/testData/codegen/ranges/expression/simpleDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleDownTo.kt similarity index 100% rename from compiler/testData/codegen/ranges/expression/simpleDownTo.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleDownTo.kt diff --git a/compiler/testData/codegen/ranges/expression/simpleRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRange.kt similarity index 100% rename from compiler/testData/codegen/ranges/expression/simpleRange.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRange.kt diff --git a/compiler/testData/codegen/ranges/expression/simpleSteppedDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedDownTo.kt similarity index 100% rename from compiler/testData/codegen/ranges/expression/simpleSteppedDownTo.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedDownTo.kt diff --git a/compiler/testData/codegen/ranges/expression/simpleSteppedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedRange.kt similarity index 100% rename from compiler/testData/codegen/ranges/expression/simpleSteppedRange.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedRange.kt diff --git a/compiler/testData/codegen/ranges/literal/emptyDownto.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyDownto.kt similarity index 100% rename from compiler/testData/codegen/ranges/literal/emptyDownto.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyDownto.kt diff --git a/compiler/testData/codegen/ranges/literal/emptyRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyRange.kt similarity index 100% rename from compiler/testData/codegen/ranges/literal/emptyRange.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyRange.kt diff --git a/compiler/testData/codegen/ranges/literal/inexactSteppedDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedDownTo.kt similarity index 100% rename from compiler/testData/codegen/ranges/literal/inexactSteppedDownTo.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedDownTo.kt diff --git a/compiler/testData/codegen/ranges/literal/inexactSteppedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedRange.kt similarity index 100% rename from compiler/testData/codegen/ranges/literal/inexactSteppedRange.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedRange.kt diff --git a/compiler/testData/codegen/ranges/literal/oneElementDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementDownTo.kt similarity index 100% rename from compiler/testData/codegen/ranges/literal/oneElementDownTo.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementDownTo.kt diff --git a/compiler/testData/codegen/ranges/literal/oneElementRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementRange.kt similarity index 100% rename from compiler/testData/codegen/ranges/literal/oneElementRange.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementRange.kt diff --git a/compiler/testData/codegen/ranges/literal/reversedBackSequence.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedBackSequence.kt similarity index 100% rename from compiler/testData/codegen/ranges/literal/reversedBackSequence.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedBackSequence.kt diff --git a/compiler/testData/codegen/ranges/literal/reversedEmptyBackSequence.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyBackSequence.kt similarity index 100% rename from compiler/testData/codegen/ranges/literal/reversedEmptyBackSequence.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyBackSequence.kt diff --git a/compiler/testData/codegen/ranges/literal/reversedEmptyRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyRange.kt similarity index 100% rename from compiler/testData/codegen/ranges/literal/reversedEmptyRange.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyRange.kt diff --git a/compiler/testData/codegen/ranges/literal/reversedInexactSteppedDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedInexactSteppedDownTo.kt similarity index 100% rename from compiler/testData/codegen/ranges/literal/reversedInexactSteppedDownTo.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedInexactSteppedDownTo.kt diff --git a/compiler/testData/codegen/ranges/literal/reversedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedRange.kt similarity index 100% rename from compiler/testData/codegen/ranges/literal/reversedRange.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedRange.kt diff --git a/compiler/testData/codegen/ranges/literal/reversedSimpleSteppedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedSimpleSteppedRange.kt similarity index 100% rename from compiler/testData/codegen/ranges/literal/reversedSimpleSteppedRange.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedSimpleSteppedRange.kt diff --git a/compiler/testData/codegen/ranges/literal/simpleDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleDownTo.kt similarity index 100% rename from compiler/testData/codegen/ranges/literal/simpleDownTo.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleDownTo.kt diff --git a/compiler/testData/codegen/ranges/literal/simpleRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRange.kt similarity index 100% rename from compiler/testData/codegen/ranges/literal/simpleRange.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRange.kt diff --git a/compiler/testData/codegen/ranges/literal/simpleSteppedDownTo.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedDownTo.kt similarity index 100% rename from compiler/testData/codegen/ranges/literal/simpleSteppedDownTo.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedDownTo.kt diff --git a/compiler/testData/codegen/ranges/literal/simpleSteppedRange.kt b/compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedRange.kt similarity index 100% rename from compiler/testData/codegen/ranges/literal/simpleSteppedRange.kt rename to compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedRange.kt diff --git a/compiler/tests/org/jetbrains/jet/codegen/AbstractDataClassCodegenTest.java b/compiler/tests/org/jetbrains/jet/codegen/AbstractDataClassCodegenTest.java deleted file mode 100644 index 3c85f41ae80..00000000000 --- a/compiler/tests/org/jetbrains/jet/codegen/AbstractDataClassCodegenTest.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2010-2013 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 abstract class AbstractDataClassCodegenTest extends CodegenTestCase { - @Override - protected void setUp() throws Exception { - super.setUp(); - createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.ALL); - } -} diff --git a/compiler/tests/org/jetbrains/jet/codegen/DataClassCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/DataClassCodegenTestGenerated.java deleted file mode 100644 index 93794f5dc19..00000000000 --- a/compiler/tests/org/jetbrains/jet/codegen/DataClassCodegenTestGenerated.java +++ /dev/null @@ -1,311 +0,0 @@ -/* - * Copyright 2010-2013 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 junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestSuite; - -import java.io.File; -import java.util.regex.Pattern; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; - -import org.jetbrains.jet.codegen.AbstractDataClassCodegenTest; - -/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("compiler/testData/codegen/dataClasses") -@InnerTestClasses({DataClassCodegenTestGenerated.Copy.class, DataClassCodegenTestGenerated.Equals.class, DataClassCodegenTestGenerated.Hashcode.class, DataClassCodegenTestGenerated.Tostring.class}) -public class DataClassCodegenTestGenerated extends AbstractDataClassCodegenTest { - public void testAllFilesPresentInDataClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/dataClasses"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("arrayParams.kt") - public void testArrayParams() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/arrayParams.kt"); - } - - @TestMetadata("changingVarParam.kt") - public void testChangingVarParam() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/changingVarParam.kt"); - } - - @TestMetadata("genericParam.kt") - public void testGenericParam() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/genericParam.kt"); - } - - @TestMetadata("mixedParams.kt") - public void testMixedParams() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/mixedParams.kt"); - } - - @TestMetadata("multiDeclaration.kt") - public void testMultiDeclaration() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/multiDeclaration.kt"); - } - - @TestMetadata("multiDeclarationFor.kt") - public void testMultiDeclarationFor() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/multiDeclarationFor.kt"); - } - - @TestMetadata("overriddenProperty.kt") - public void testOverriddenProperty() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/overriddenProperty.kt"); - } - - @TestMetadata("twoValParams.kt") - public void testTwoValParams() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/twoValParams.kt"); - } - - @TestMetadata("twoVarParams.kt") - public void testTwoVarParams() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/twoVarParams.kt"); - } - - @TestMetadata("unitComponent.kt") - public void testUnitComponent() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/unitComponent.kt"); - } - - @TestMetadata("compiler/testData/codegen/dataClasses/copy") - public static class Copy extends AbstractDataClassCodegenTest { - public void testAllFilesPresentInCopy() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/dataClasses/copy"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("constructorWithDefaultParam.kt") - public void testConstructorWithDefaultParam() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/copy/constructorWithDefaultParam.kt"); - } - - @TestMetadata("copyInNestedDataClass.kt") - public void testCopyInNestedDataClass() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/copy/copyInNestedDataClass.kt"); - } - - @TestMetadata("copyInObjectNestedDataClass.kt") - public void testCopyInObjectNestedDataClass() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/copy/copyInObjectNestedDataClass.kt"); - } - - @TestMetadata("kt3033.kt") - public void testKt3033() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/copy/kt3033.kt"); - } - - @TestMetadata("paramWithoutProperty.kt") - public void testParamWithoutProperty() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/copy/paramWithoutProperty.kt"); - } - - @TestMetadata("valInConstructorParams.kt") - public void testValInConstructorParams() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/copy/valInConstructorParams.kt"); - } - - @TestMetadata("varInConstructorParams.kt") - public void testVarInConstructorParams() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/copy/varInConstructorParams.kt"); - } - - @TestMetadata("withGenericParameter.kt") - public void testWithGenericParameter() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/copy/withGenericParameter.kt"); - } - - } - - @TestMetadata("compiler/testData/codegen/dataClasses/equals") - public static class Equals extends AbstractDataClassCodegenTest { - public void testAllFilesPresentInEquals() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/dataClasses/equals"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("alreadyDeclared.kt") - public void testAlreadyDeclared() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/equals/alreadyDeclared.kt"); - } - - @TestMetadata("alreadyDeclaredWrongSignature.kt") - public void testAlreadyDeclaredWrongSignature() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/equals/alreadyDeclaredWrongSignature.kt"); - } - - @TestMetadata("genericarray.kt") - public void testGenericarray() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/equals/genericarray.kt"); - } - - @TestMetadata("instanceof.kt") - public void testInstanceof() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/equals/instanceof.kt"); - } - - @TestMetadata("intarray.kt") - public void testIntarray() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/equals/intarray.kt"); - } - - @TestMetadata("nullother.kt") - public void testNullother() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/equals/nullother.kt"); - } - - @TestMetadata("sameinstance.kt") - public void testSameinstance() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/equals/sameinstance.kt"); - } - - } - - @TestMetadata("compiler/testData/codegen/dataClasses/hashcode") - public static class Hashcode extends AbstractDataClassCodegenTest { - public void testAllFilesPresentInHashcode() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/dataClasses/hashcode"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("alreadyDeclared.kt") - public void testAlreadyDeclared() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/hashcode/alreadyDeclared.kt"); - } - - @TestMetadata("alreadyDeclaredWrongSignature.kt") - public void testAlreadyDeclaredWrongSignature() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/hashcode/alreadyDeclaredWrongSignature.kt"); - } - - @TestMetadata("array.kt") - public void testArray() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/hashcode/array.kt"); - } - - @TestMetadata("boolean.kt") - public void testBoolean() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/hashcode/boolean.kt"); - } - - @TestMetadata("byte.kt") - public void testByte() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/hashcode/byte.kt"); - } - - @TestMetadata("char.kt") - public void testChar() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/hashcode/char.kt"); - } - - @TestMetadata("double.kt") - public void testDouble() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/hashcode/double.kt"); - } - - @TestMetadata("float.kt") - public void testFloat() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/hashcode/float.kt"); - } - - @TestMetadata("genericNull.kt") - public void testGenericNull() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/hashcode/genericNull.kt"); - } - - @TestMetadata("int.kt") - public void testInt() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/hashcode/int.kt"); - } - - @TestMetadata("long.kt") - public void testLong() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/hashcode/long.kt"); - } - - @TestMetadata("null.kt") - public void testNull() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/hashcode/null.kt"); - } - - @TestMetadata("short.kt") - public void testShort() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/hashcode/short.kt"); - } - - } - - @TestMetadata("compiler/testData/codegen/dataClasses/tostring") - public static class Tostring extends AbstractDataClassCodegenTest { - public void testAllFilesPresentInTostring() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/dataClasses/tostring"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("alreadyDeclared.kt") - public void testAlreadyDeclared() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/tostring/alreadyDeclared.kt"); - } - - @TestMetadata("alreadyDeclaredWrongSignature.kt") - public void testAlreadyDeclaredWrongSignature() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/tostring/alreadyDeclaredWrongSignature.kt"); - } - - @TestMetadata("arrayParams.kt") - public void testArrayParams() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/tostring/arrayParams.kt"); - } - - @TestMetadata("changingVarParam.kt") - public void testChangingVarParam() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/tostring/changingVarParam.kt"); - } - - @TestMetadata("genericParam.kt") - public void testGenericParam() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/tostring/genericParam.kt"); - } - - @TestMetadata("mixedParams.kt") - public void testMixedParams() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/tostring/mixedParams.kt"); - } - - @TestMetadata("overriddenProperty.kt") - public void testOverriddenProperty() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/tostring/overriddenProperty.kt"); - } - - @TestMetadata("unitComponent.kt") - public void testUnitComponent() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/dataClasses/tostring/unitComponent.kt"); - } - - } - - public static Test suite() { - TestSuite suite = new TestSuite("DataClassCodegenTestGenerated"); - suite.addTestSuite(DataClassCodegenTestGenerated.class); - suite.addTestSuite(Copy.class); - suite.addTestSuite(Equals.class); - suite.addTestSuite(Hashcode.class); - suite.addTestSuite(Tostring.class); - return suite; - } -} diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/AbstractRangesCodegenTest.java b/compiler/tests/org/jetbrains/jet/codegen/generated/AbstractRangesCodegenTest.java deleted file mode 100644 index 66a83f5c027..00000000000 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/AbstractRangesCodegenTest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2010-2013 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.generated; - -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.codegen.CodegenTestCase; - -public abstract class AbstractRangesCodegenTest extends CodegenTestCase { - @Override - public void setUp() throws Exception { - super.setUp(); - createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.ALL); - } -} \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/RangesCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/RangesCodegenTestGenerated.java deleted file mode 100644 index 7220c307c6e..00000000000 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/RangesCodegenTestGenerated.java +++ /dev/null @@ -1,223 +0,0 @@ -/* - * Copyright 2010-2013 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.generated; - -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestSuite; - -import java.io.File; -import java.util.regex.Pattern; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; - -import org.jetbrains.jet.codegen.generated.AbstractRangesCodegenTest; - -/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("compiler/testData/codegen/ranges") -@InnerTestClasses({RangesCodegenTestGenerated.Expression.class, RangesCodegenTestGenerated.Literal.class}) -public class RangesCodegenTestGenerated extends AbstractRangesCodegenTest { - public void testAllFilesPresentInRanges() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/ranges"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("compiler/testData/codegen/ranges/expression") - public static class Expression extends AbstractRangesCodegenTest { - public void testAllFilesPresentInExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/ranges/expression"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("emptyDownto.kt") - public void testEmptyDownto() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/expression/emptyDownto.kt"); - } - - @TestMetadata("emptyRange.kt") - public void testEmptyRange() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/expression/emptyRange.kt"); - } - - @TestMetadata("inexactSteppedDownTo.kt") - public void testInexactSteppedDownTo() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/expression/inexactSteppedDownTo.kt"); - } - - @TestMetadata("inexactSteppedRange.kt") - public void testInexactSteppedRange() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/expression/inexactSteppedRange.kt"); - } - - @TestMetadata("oneElementDownTo.kt") - public void testOneElementDownTo() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/expression/oneElementDownTo.kt"); - } - - @TestMetadata("oneElementRange.kt") - public void testOneElementRange() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/expression/oneElementRange.kt"); - } - - @TestMetadata("reversedBackSequence.kt") - public void testReversedBackSequence() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/expression/reversedBackSequence.kt"); - } - - @TestMetadata("reversedEmptyBackSequence.kt") - public void testReversedEmptyBackSequence() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/expression/reversedEmptyBackSequence.kt"); - } - - @TestMetadata("reversedEmptyRange.kt") - public void testReversedEmptyRange() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/expression/reversedEmptyRange.kt"); - } - - @TestMetadata("reversedInexactSteppedDownTo.kt") - public void testReversedInexactSteppedDownTo() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/expression/reversedInexactSteppedDownTo.kt"); - } - - @TestMetadata("reversedRange.kt") - public void testReversedRange() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/expression/reversedRange.kt"); - } - - @TestMetadata("reversedSimpleSteppedRange.kt") - public void testReversedSimpleSteppedRange() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/expression/reversedSimpleSteppedRange.kt"); - } - - @TestMetadata("simpleDownTo.kt") - public void testSimpleDownTo() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/expression/simpleDownTo.kt"); - } - - @TestMetadata("simpleRange.kt") - public void testSimpleRange() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/expression/simpleRange.kt"); - } - - @TestMetadata("simpleSteppedDownTo.kt") - public void testSimpleSteppedDownTo() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/expression/simpleSteppedDownTo.kt"); - } - - @TestMetadata("simpleSteppedRange.kt") - public void testSimpleSteppedRange() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/expression/simpleSteppedRange.kt"); - } - - } - - @TestMetadata("compiler/testData/codegen/ranges/literal") - public static class Literal extends AbstractRangesCodegenTest { - public void testAllFilesPresentInLiteral() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/ranges/literal"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("emptyDownto.kt") - public void testEmptyDownto() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/literal/emptyDownto.kt"); - } - - @TestMetadata("emptyRange.kt") - public void testEmptyRange() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/literal/emptyRange.kt"); - } - - @TestMetadata("inexactSteppedDownTo.kt") - public void testInexactSteppedDownTo() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/literal/inexactSteppedDownTo.kt"); - } - - @TestMetadata("inexactSteppedRange.kt") - public void testInexactSteppedRange() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/literal/inexactSteppedRange.kt"); - } - - @TestMetadata("oneElementDownTo.kt") - public void testOneElementDownTo() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/literal/oneElementDownTo.kt"); - } - - @TestMetadata("oneElementRange.kt") - public void testOneElementRange() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/literal/oneElementRange.kt"); - } - - @TestMetadata("reversedBackSequence.kt") - public void testReversedBackSequence() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/literal/reversedBackSequence.kt"); - } - - @TestMetadata("reversedEmptyBackSequence.kt") - public void testReversedEmptyBackSequence() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/literal/reversedEmptyBackSequence.kt"); - } - - @TestMetadata("reversedEmptyRange.kt") - public void testReversedEmptyRange() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/literal/reversedEmptyRange.kt"); - } - - @TestMetadata("reversedInexactSteppedDownTo.kt") - public void testReversedInexactSteppedDownTo() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/literal/reversedInexactSteppedDownTo.kt"); - } - - @TestMetadata("reversedRange.kt") - public void testReversedRange() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/literal/reversedRange.kt"); - } - - @TestMetadata("reversedSimpleSteppedRange.kt") - public void testReversedSimpleSteppedRange() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/literal/reversedSimpleSteppedRange.kt"); - } - - @TestMetadata("simpleDownTo.kt") - public void testSimpleDownTo() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/literal/simpleDownTo.kt"); - } - - @TestMetadata("simpleRange.kt") - public void testSimpleRange() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/literal/simpleRange.kt"); - } - - @TestMetadata("simpleSteppedDownTo.kt") - public void testSimpleSteppedDownTo() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/literal/simpleSteppedDownTo.kt"); - } - - @TestMetadata("simpleSteppedRange.kt") - public void testSimpleSteppedRange() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/ranges/literal/simpleSteppedRange.kt"); - } - - } - - public static Test suite() { - TestSuite suite = new TestSuite("RangesCodegenTestGenerated"); - suite.addTestSuite(RangesCodegenTestGenerated.class); - suite.addTestSuite(Expression.class); - suite.addTestSuite(Literal.class); - return suite; - } -} diff --git a/generators/org/jetbrains/jet/generators/tests/GenerateRangesCodegenTestData.java b/generators/org/jetbrains/jet/generators/tests/GenerateRangesCodegenTestData.java index 9c85dddd6b3..47ca5ee03af 100644 --- a/generators/org/jetbrains/jet/generators/tests/GenerateRangesCodegenTestData.java +++ b/generators/org/jetbrains/jet/generators/tests/GenerateRangesCodegenTestData.java @@ -27,7 +27,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; public class GenerateRangesCodegenTestData { - private static final File TEST_DATA_DIR = new File("compiler/testData/codegen/ranges"); + private static final File TEST_DATA_DIR = new File("compiler/testData/codegen/boxWithStdlib/ranges"); private static final File AS_LITERAL_DIR = new File(TEST_DATA_DIR, "literal"); private static final File AS_EXPRESSION_DIR = new File(TEST_DATA_DIR, "expression"); private static final File SOURCE_TEST_FILE = new File("libraries/stdlib/test/language/RangeIterationTest.kt"); diff --git a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java index fc1c4e9c750..fea9148c2b8 100644 --- a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java +++ b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java @@ -21,12 +21,11 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve; import org.jetbrains.jet.checkers.AbstractJetPsiCheckerTest; import org.jetbrains.jet.codegen.AbstractCheckLocalVariablesTableTest; -import org.jetbrains.jet.codegen.AbstractDataClassCodegenTest; import org.jetbrains.jet.codegen.AbstractJavaVisibilityTest; import org.jetbrains.jet.codegen.defaultConstructor.AbstractDefaultConstructorCodegenTest; import org.jetbrains.jet.codegen.flags.AbstractWriteFlagsTest; import org.jetbrains.jet.codegen.generated.AbstractBlackBoxCodegenTest; -import org.jetbrains.jet.codegen.generated.AbstractRangesCodegenTest; +import org.jetbrains.jet.codegen.generated.AbstractBlackBoxWithStdlibCodegenTest; import org.jetbrains.jet.jvm.compiler.*; import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveDescriptorRendererTest; import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest; @@ -78,13 +77,6 @@ public class GenerateTests { GenerateRangesCodegenTestData.main(args); - generateTest( - "compiler/tests/", - "RangesCodegenTestGenerated", - AbstractRangesCodegenTest.class, - testModel("compiler/testData/codegen/ranges", "blackBoxFileByFullPath") - ); - generateTest( "compiler/tests/", "BlackBoxWithJavaCodegenTestGenerated", @@ -92,13 +84,6 @@ public class GenerateTests { testModel("compiler/testData/codegen/boxWithJava", "blackBoxFileWithJavaByFullPath") ); - generateTest( - "compiler/tests/", - "DataClassCodegenTestGenerated", - AbstractDataClassCodegenTest.class, - testModel("compiler/testData/codegen/dataClasses", "blackBoxFileByFullPath") - ); - generateTest( "compiler/tests/", "JavaVisibilityTestGenerated",