From 49dbcaa7284123bdb2f7ece5d9f6f43f1b173a80 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Tue, 17 Jan 2012 19:32:18 +0400 Subject: [PATCH] rename ReadClassDataTest --- .../class/Class.kt | 0 .../class/ClassInParam.kt | 0 .../class/ClassInnerClass.kt | 0 .../class/ClassOutParam.kt | 0 .../class/ClassParam.kt | 0 .../class/ClassParamReferencesParam.kt | 0 .../class/ClassParamReferencesParam2.kt | 0 .../class/ClassParamUpperClassBound.kt | 0 .../class/ClassParamUpperClassInterfaceBound.kt | 0 .../class/ClassParamUpperInterfaceBound.kt | 0 .../class/ClassParamUpperInterfaceClassBound.kt | 0 .../class/ClassTwoParams.kt | 0 .../class/ClassTwoParams2.kt | 0 .../class/Trait.kt | 0 .../classFun/ClassInParamUsedInFun.kt | 0 .../classFun/ClassParamUsedInFun.kt | 0 .../constructor/Constructor0.kt | 0 .../constructor/Constructor1.kt | 0 .../fun/genericWithTypeVariables/FunGenericParam.kt | 0 .../fun/genericWithTypeVariables/FunInParam.kt | 0 .../fun/genericWithTypeVariables/FunOutParam.kt | 0 .../fun/genericWithTypeVariables/FunParamParam.kt | 0 .../FunParamReferencesParam.kt | 0 .../FunParamReferencesParam2.kt | 0 .../FunParamUpperClassBound.kt | 0 .../FunParamUpperClassInterfaceBound.kt | 0 .../FunParamUpperInterfaceBound.kt | 0 .../FunParamUpperInterfaceClassBound.kt | 0 .../fun/genericWithTypeVariables/FunParamVaragParam.kt | 0 .../fun/genericWithTypeVariables/FunTwoTypeParams.kt | 0 .../fun/genericWithTypeVariables/FunTwoTypeParams2.kt | 0 .../FunClassParamNotNull.kt | 0 .../FunClassParamNullable.kt | 0 .../genericWithoutTypeVariables/FunParamNullable.kt | 0 .../ReturnTypeClassParamNotNull.kt | 0 .../ReturnTypeClassParamNullable.kt | 0 .../fun/nonGeneric/ClassFun.kt | 0 .../fun/nonGeneric/ClassFunGetFoo.kt | 0 .../fun/nonGeneric/ClassFunGetFooSetFoo.kt | 0 .../fun/nonGeneric/ClassFunSetFoo.kt | 0 .../fun/nonGeneric/ExtFun.kt | 0 .../fun/nonGeneric/ExtFunInClass.kt | 0 .../fun/nonGeneric/FunDefaultArg.kt | 0 .../fun/nonGeneric/FunParamNotNull.kt | 0 .../fun/nonGeneric/FunVarargCharSequence.kt | 0 .../fun/nonGeneric/FunVarargInt.kt | 0 .../fun/nonGeneric/ModifierAbstract.kt | 0 .../fun/nonGeneric/ModifierOpen.kt | 0 .../fun/nonGeneric/NsFun.kt | 0 .../fun/nonGeneric/NsFunGetFoo.kt | 0 .../fun/nonGeneric/ReturnTypeNotNull.kt | 0 .../fun/nonGeneric/ReturnTypeNullable.kt | 0 .../prop/ClassVal.kt | 0 .../prop/ClassValAbstract.kt | 0 .../prop/ClassVar.kt | 0 .../prop/ExtValClass.kt | 0 .../prop/ExtValInClass.kt | 0 .../prop/ExtValInt.kt | 0 .../prop/ExtValIntCharSequence.kt | 0 .../prop/ExtValIntCharSequenceQ.kt | 0 .../prop/ExtValIntListQOfIntInClass.kt | 0 .../prop/ExtValIntTInClass.kt | 0 .../prop/ExtValIntTQInClass.kt | 0 .../prop/ExtValTIntInClass.kt | 0 .../prop/ExtVarClass.kt | 0 .../prop/ExtVarInClass.kt | 0 .../prop/ExtVarInt.kt | 0 .../prop/ExtVarIntTInClass.kt | 0 .../prop/ExtVarIntTQInClass.kt | 0 .../prop/ExtVarMapPQInt.kt | 0 .../prop/ExtVarTIntInClass.kt | 0 .../prop/ExtVarTQIntInClass.kt | 0 .../{readClass => readKotlinBinaryClass}/prop/NsVal.kt | 0 .../{readClass => readKotlinBinaryClass}/prop/NsVar.kt | 0 .../type/ArrayOfCharSequence.kt | 0 .../type/ArrayOfInt.kt | 0 .../type/ArrayOfString.kt | 0 .../{readClass => readKotlinBinaryClass}/type/Int.kt | 0 .../type/IntArray.kt | 0 .../{readClass => readKotlinBinaryClass}/type/IntQ.kt | 0 .../type/ListOfString.kt | 0 .../type/String.kt | 0 .../type/StringQ.kt | 0 ...assDataTest.java => ReadKotlinBinaryClassTest.java} | 10 ++++++---- 84 files changed, 6 insertions(+), 4 deletions(-) rename compiler/testData/{readClass => readKotlinBinaryClass}/class/Class.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/class/ClassInParam.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/class/ClassInnerClass.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/class/ClassOutParam.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/class/ClassParam.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/class/ClassParamReferencesParam.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/class/ClassParamReferencesParam2.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/class/ClassParamUpperClassBound.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/class/ClassParamUpperClassInterfaceBound.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/class/ClassParamUpperInterfaceBound.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/class/ClassParamUpperInterfaceClassBound.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/class/ClassTwoParams.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/class/ClassTwoParams2.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/class/Trait.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/classFun/ClassInParamUsedInFun.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/classFun/ClassParamUsedInFun.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/constructor/Constructor0.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/constructor/Constructor1.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/genericWithTypeVariables/FunGenericParam.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/genericWithTypeVariables/FunInParam.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/genericWithTypeVariables/FunOutParam.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/genericWithTypeVariables/FunParamParam.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/genericWithTypeVariables/FunParamReferencesParam.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/genericWithTypeVariables/FunParamReferencesParam2.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/genericWithTypeVariables/FunParamUpperClassBound.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/genericWithTypeVariables/FunParamVaragParam.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/genericWithTypeVariables/FunTwoTypeParams.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/genericWithTypeVariables/FunTwoTypeParams2.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/genericWithoutTypeVariables/FunClassParamNullable.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/genericWithoutTypeVariables/FunParamNullable.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/nonGeneric/ClassFun.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/nonGeneric/ClassFunGetFoo.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/nonGeneric/ClassFunGetFooSetFoo.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/nonGeneric/ClassFunSetFoo.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/nonGeneric/ExtFun.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/nonGeneric/ExtFunInClass.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/nonGeneric/FunDefaultArg.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/nonGeneric/FunParamNotNull.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/nonGeneric/FunVarargCharSequence.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/nonGeneric/FunVarargInt.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/nonGeneric/ModifierAbstract.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/nonGeneric/ModifierOpen.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/nonGeneric/NsFun.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/nonGeneric/NsFunGetFoo.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/nonGeneric/ReturnTypeNotNull.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/fun/nonGeneric/ReturnTypeNullable.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/prop/ClassVal.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/prop/ClassValAbstract.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/prop/ClassVar.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/prop/ExtValClass.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/prop/ExtValInClass.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/prop/ExtValInt.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/prop/ExtValIntCharSequence.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/prop/ExtValIntCharSequenceQ.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/prop/ExtValIntListQOfIntInClass.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/prop/ExtValIntTInClass.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/prop/ExtValIntTQInClass.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/prop/ExtValTIntInClass.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/prop/ExtVarClass.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/prop/ExtVarInClass.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/prop/ExtVarInt.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/prop/ExtVarIntTInClass.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/prop/ExtVarIntTQInClass.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/prop/ExtVarMapPQInt.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/prop/ExtVarTIntInClass.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/prop/ExtVarTQIntInClass.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/prop/NsVal.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/prop/NsVar.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/type/ArrayOfCharSequence.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/type/ArrayOfInt.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/type/ArrayOfString.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/type/Int.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/type/IntArray.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/type/IntQ.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/type/ListOfString.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/type/String.kt (100%) rename compiler/testData/{readClass => readKotlinBinaryClass}/type/StringQ.kt (100%) rename compiler/tests/org/jetbrains/jet/{ReadClassDataTest.java => ReadKotlinBinaryClassTest.java} (98%) diff --git a/compiler/testData/readClass/class/Class.kt b/compiler/testData/readKotlinBinaryClass/class/Class.kt similarity index 100% rename from compiler/testData/readClass/class/Class.kt rename to compiler/testData/readKotlinBinaryClass/class/Class.kt diff --git a/compiler/testData/readClass/class/ClassInParam.kt b/compiler/testData/readKotlinBinaryClass/class/ClassInParam.kt similarity index 100% rename from compiler/testData/readClass/class/ClassInParam.kt rename to compiler/testData/readKotlinBinaryClass/class/ClassInParam.kt diff --git a/compiler/testData/readClass/class/ClassInnerClass.kt b/compiler/testData/readKotlinBinaryClass/class/ClassInnerClass.kt similarity index 100% rename from compiler/testData/readClass/class/ClassInnerClass.kt rename to compiler/testData/readKotlinBinaryClass/class/ClassInnerClass.kt diff --git a/compiler/testData/readClass/class/ClassOutParam.kt b/compiler/testData/readKotlinBinaryClass/class/ClassOutParam.kt similarity index 100% rename from compiler/testData/readClass/class/ClassOutParam.kt rename to compiler/testData/readKotlinBinaryClass/class/ClassOutParam.kt diff --git a/compiler/testData/readClass/class/ClassParam.kt b/compiler/testData/readKotlinBinaryClass/class/ClassParam.kt similarity index 100% rename from compiler/testData/readClass/class/ClassParam.kt rename to compiler/testData/readKotlinBinaryClass/class/ClassParam.kt diff --git a/compiler/testData/readClass/class/ClassParamReferencesParam.kt b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.kt similarity index 100% rename from compiler/testData/readClass/class/ClassParamReferencesParam.kt rename to compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.kt diff --git a/compiler/testData/readClass/class/ClassParamReferencesParam2.kt b/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.kt similarity index 100% rename from compiler/testData/readClass/class/ClassParamReferencesParam2.kt rename to compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.kt diff --git a/compiler/testData/readClass/class/ClassParamUpperClassBound.kt b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.kt similarity index 100% rename from compiler/testData/readClass/class/ClassParamUpperClassBound.kt rename to compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.kt diff --git a/compiler/testData/readClass/class/ClassParamUpperClassInterfaceBound.kt b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.kt similarity index 100% rename from compiler/testData/readClass/class/ClassParamUpperClassInterfaceBound.kt rename to compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.kt diff --git a/compiler/testData/readClass/class/ClassParamUpperInterfaceBound.kt b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.kt similarity index 100% rename from compiler/testData/readClass/class/ClassParamUpperInterfaceBound.kt rename to compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.kt diff --git a/compiler/testData/readClass/class/ClassParamUpperInterfaceClassBound.kt b/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.kt similarity index 100% rename from compiler/testData/readClass/class/ClassParamUpperInterfaceClassBound.kt rename to compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.kt diff --git a/compiler/testData/readClass/class/ClassTwoParams.kt b/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.kt similarity index 100% rename from compiler/testData/readClass/class/ClassTwoParams.kt rename to compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.kt diff --git a/compiler/testData/readClass/class/ClassTwoParams2.kt b/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.kt similarity index 100% rename from compiler/testData/readClass/class/ClassTwoParams2.kt rename to compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.kt diff --git a/compiler/testData/readClass/class/Trait.kt b/compiler/testData/readKotlinBinaryClass/class/Trait.kt similarity index 100% rename from compiler/testData/readClass/class/Trait.kt rename to compiler/testData/readKotlinBinaryClass/class/Trait.kt diff --git a/compiler/testData/readClass/classFun/ClassInParamUsedInFun.kt b/compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.kt similarity index 100% rename from compiler/testData/readClass/classFun/ClassInParamUsedInFun.kt rename to compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.kt diff --git a/compiler/testData/readClass/classFun/ClassParamUsedInFun.kt b/compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.kt similarity index 100% rename from compiler/testData/readClass/classFun/ClassParamUsedInFun.kt rename to compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.kt diff --git a/compiler/testData/readClass/constructor/Constructor0.kt b/compiler/testData/readKotlinBinaryClass/constructor/Constructor0.kt similarity index 100% rename from compiler/testData/readClass/constructor/Constructor0.kt rename to compiler/testData/readKotlinBinaryClass/constructor/Constructor0.kt diff --git a/compiler/testData/readClass/constructor/Constructor1.kt b/compiler/testData/readKotlinBinaryClass/constructor/Constructor1.kt similarity index 100% rename from compiler/testData/readClass/constructor/Constructor1.kt rename to compiler/testData/readKotlinBinaryClass/constructor/Constructor1.kt diff --git a/compiler/testData/readClass/fun/genericWithTypeVariables/FunGenericParam.kt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunGenericParam.kt similarity index 100% rename from compiler/testData/readClass/fun/genericWithTypeVariables/FunGenericParam.kt rename to compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunGenericParam.kt diff --git a/compiler/testData/readClass/fun/genericWithTypeVariables/FunInParam.kt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunInParam.kt similarity index 100% rename from compiler/testData/readClass/fun/genericWithTypeVariables/FunInParam.kt rename to compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunInParam.kt diff --git a/compiler/testData/readClass/fun/genericWithTypeVariables/FunOutParam.kt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunOutParam.kt similarity index 100% rename from compiler/testData/readClass/fun/genericWithTypeVariables/FunOutParam.kt rename to compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunOutParam.kt diff --git a/compiler/testData/readClass/fun/genericWithTypeVariables/FunParamParam.kt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParam.kt similarity index 100% rename from compiler/testData/readClass/fun/genericWithTypeVariables/FunParamParam.kt rename to compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParam.kt diff --git a/compiler/testData/readClass/fun/genericWithTypeVariables/FunParamReferencesParam.kt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam.kt similarity index 100% rename from compiler/testData/readClass/fun/genericWithTypeVariables/FunParamReferencesParam.kt rename to compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam.kt diff --git a/compiler/testData/readClass/fun/genericWithTypeVariables/FunParamReferencesParam2.kt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam2.kt similarity index 100% rename from compiler/testData/readClass/fun/genericWithTypeVariables/FunParamReferencesParam2.kt rename to compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam2.kt diff --git a/compiler/testData/readClass/fun/genericWithTypeVariables/FunParamUpperClassBound.kt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassBound.kt similarity index 100% rename from compiler/testData/readClass/fun/genericWithTypeVariables/FunParamUpperClassBound.kt rename to compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassBound.kt diff --git a/compiler/testData/readClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt similarity index 100% rename from compiler/testData/readClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt rename to compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt diff --git a/compiler/testData/readClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt similarity index 100% rename from compiler/testData/readClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt rename to compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt diff --git a/compiler/testData/readClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt similarity index 100% rename from compiler/testData/readClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt rename to compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt diff --git a/compiler/testData/readClass/fun/genericWithTypeVariables/FunParamVaragParam.kt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.kt similarity index 100% rename from compiler/testData/readClass/fun/genericWithTypeVariables/FunParamVaragParam.kt rename to compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.kt diff --git a/compiler/testData/readClass/fun/genericWithTypeVariables/FunTwoTypeParams.kt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams.kt similarity index 100% rename from compiler/testData/readClass/fun/genericWithTypeVariables/FunTwoTypeParams.kt rename to compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams.kt diff --git a/compiler/testData/readClass/fun/genericWithTypeVariables/FunTwoTypeParams2.kt b/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams2.kt similarity index 100% rename from compiler/testData/readClass/fun/genericWithTypeVariables/FunTwoTypeParams2.kt rename to compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams2.kt diff --git a/compiler/testData/readClass/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt similarity index 100% rename from compiler/testData/readClass/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt rename to compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt diff --git a/compiler/testData/readClass/fun/genericWithoutTypeVariables/FunClassParamNullable.kt b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNullable.kt similarity index 100% rename from compiler/testData/readClass/fun/genericWithoutTypeVariables/FunClassParamNullable.kt rename to compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNullable.kt diff --git a/compiler/testData/readClass/fun/genericWithoutTypeVariables/FunParamNullable.kt b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunParamNullable.kt similarity index 100% rename from compiler/testData/readClass/fun/genericWithoutTypeVariables/FunParamNullable.kt rename to compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunParamNullable.kt diff --git a/compiler/testData/readClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt similarity index 100% rename from compiler/testData/readClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt rename to compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt diff --git a/compiler/testData/readClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt b/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt similarity index 100% rename from compiler/testData/readClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt rename to compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt diff --git a/compiler/testData/readClass/fun/nonGeneric/ClassFun.kt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFun.kt similarity index 100% rename from compiler/testData/readClass/fun/nonGeneric/ClassFun.kt rename to compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFun.kt diff --git a/compiler/testData/readClass/fun/nonGeneric/ClassFunGetFoo.kt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFoo.kt similarity index 100% rename from compiler/testData/readClass/fun/nonGeneric/ClassFunGetFoo.kt rename to compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFoo.kt diff --git a/compiler/testData/readClass/fun/nonGeneric/ClassFunGetFooSetFoo.kt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFooSetFoo.kt similarity index 100% rename from compiler/testData/readClass/fun/nonGeneric/ClassFunGetFooSetFoo.kt rename to compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFooSetFoo.kt diff --git a/compiler/testData/readClass/fun/nonGeneric/ClassFunSetFoo.kt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunSetFoo.kt similarity index 100% rename from compiler/testData/readClass/fun/nonGeneric/ClassFunSetFoo.kt rename to compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunSetFoo.kt diff --git a/compiler/testData/readClass/fun/nonGeneric/ExtFun.kt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFun.kt similarity index 100% rename from compiler/testData/readClass/fun/nonGeneric/ExtFun.kt rename to compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFun.kt diff --git a/compiler/testData/readClass/fun/nonGeneric/ExtFunInClass.kt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFunInClass.kt similarity index 100% rename from compiler/testData/readClass/fun/nonGeneric/ExtFunInClass.kt rename to compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFunInClass.kt diff --git a/compiler/testData/readClass/fun/nonGeneric/FunDefaultArg.kt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunDefaultArg.kt similarity index 100% rename from compiler/testData/readClass/fun/nonGeneric/FunDefaultArg.kt rename to compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunDefaultArg.kt diff --git a/compiler/testData/readClass/fun/nonGeneric/FunParamNotNull.kt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunParamNotNull.kt similarity index 100% rename from compiler/testData/readClass/fun/nonGeneric/FunParamNotNull.kt rename to compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunParamNotNull.kt diff --git a/compiler/testData/readClass/fun/nonGeneric/FunVarargCharSequence.kt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargCharSequence.kt similarity index 100% rename from compiler/testData/readClass/fun/nonGeneric/FunVarargCharSequence.kt rename to compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargCharSequence.kt diff --git a/compiler/testData/readClass/fun/nonGeneric/FunVarargInt.kt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInt.kt similarity index 100% rename from compiler/testData/readClass/fun/nonGeneric/FunVarargInt.kt rename to compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInt.kt diff --git a/compiler/testData/readClass/fun/nonGeneric/ModifierAbstract.kt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierAbstract.kt similarity index 100% rename from compiler/testData/readClass/fun/nonGeneric/ModifierAbstract.kt rename to compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierAbstract.kt diff --git a/compiler/testData/readClass/fun/nonGeneric/ModifierOpen.kt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierOpen.kt similarity index 100% rename from compiler/testData/readClass/fun/nonGeneric/ModifierOpen.kt rename to compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierOpen.kt diff --git a/compiler/testData/readClass/fun/nonGeneric/NsFun.kt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFun.kt similarity index 100% rename from compiler/testData/readClass/fun/nonGeneric/NsFun.kt rename to compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFun.kt diff --git a/compiler/testData/readClass/fun/nonGeneric/NsFunGetFoo.kt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFunGetFoo.kt similarity index 100% rename from compiler/testData/readClass/fun/nonGeneric/NsFunGetFoo.kt rename to compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFunGetFoo.kt diff --git a/compiler/testData/readClass/fun/nonGeneric/ReturnTypeNotNull.kt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNotNull.kt similarity index 100% rename from compiler/testData/readClass/fun/nonGeneric/ReturnTypeNotNull.kt rename to compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNotNull.kt diff --git a/compiler/testData/readClass/fun/nonGeneric/ReturnTypeNullable.kt b/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNullable.kt similarity index 100% rename from compiler/testData/readClass/fun/nonGeneric/ReturnTypeNullable.kt rename to compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNullable.kt diff --git a/compiler/testData/readClass/prop/ClassVal.kt b/compiler/testData/readKotlinBinaryClass/prop/ClassVal.kt similarity index 100% rename from compiler/testData/readClass/prop/ClassVal.kt rename to compiler/testData/readKotlinBinaryClass/prop/ClassVal.kt diff --git a/compiler/testData/readClass/prop/ClassValAbstract.kt b/compiler/testData/readKotlinBinaryClass/prop/ClassValAbstract.kt similarity index 100% rename from compiler/testData/readClass/prop/ClassValAbstract.kt rename to compiler/testData/readKotlinBinaryClass/prop/ClassValAbstract.kt diff --git a/compiler/testData/readClass/prop/ClassVar.kt b/compiler/testData/readKotlinBinaryClass/prop/ClassVar.kt similarity index 100% rename from compiler/testData/readClass/prop/ClassVar.kt rename to compiler/testData/readKotlinBinaryClass/prop/ClassVar.kt diff --git a/compiler/testData/readClass/prop/ExtValClass.kt b/compiler/testData/readKotlinBinaryClass/prop/ExtValClass.kt similarity index 100% rename from compiler/testData/readClass/prop/ExtValClass.kt rename to compiler/testData/readKotlinBinaryClass/prop/ExtValClass.kt diff --git a/compiler/testData/readClass/prop/ExtValInClass.kt b/compiler/testData/readKotlinBinaryClass/prop/ExtValInClass.kt similarity index 100% rename from compiler/testData/readClass/prop/ExtValInClass.kt rename to compiler/testData/readKotlinBinaryClass/prop/ExtValInClass.kt diff --git a/compiler/testData/readClass/prop/ExtValInt.kt b/compiler/testData/readKotlinBinaryClass/prop/ExtValInt.kt similarity index 100% rename from compiler/testData/readClass/prop/ExtValInt.kt rename to compiler/testData/readKotlinBinaryClass/prop/ExtValInt.kt diff --git a/compiler/testData/readClass/prop/ExtValIntCharSequence.kt b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequence.kt similarity index 100% rename from compiler/testData/readClass/prop/ExtValIntCharSequence.kt rename to compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequence.kt diff --git a/compiler/testData/readClass/prop/ExtValIntCharSequenceQ.kt b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequenceQ.kt similarity index 100% rename from compiler/testData/readClass/prop/ExtValIntCharSequenceQ.kt rename to compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequenceQ.kt diff --git a/compiler/testData/readClass/prop/ExtValIntListQOfIntInClass.kt b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntListQOfIntInClass.kt similarity index 100% rename from compiler/testData/readClass/prop/ExtValIntListQOfIntInClass.kt rename to compiler/testData/readKotlinBinaryClass/prop/ExtValIntListQOfIntInClass.kt diff --git a/compiler/testData/readClass/prop/ExtValIntTInClass.kt b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.kt similarity index 100% rename from compiler/testData/readClass/prop/ExtValIntTInClass.kt rename to compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.kt diff --git a/compiler/testData/readClass/prop/ExtValIntTQInClass.kt b/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.kt similarity index 100% rename from compiler/testData/readClass/prop/ExtValIntTQInClass.kt rename to compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.kt diff --git a/compiler/testData/readClass/prop/ExtValTIntInClass.kt b/compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.kt similarity index 100% rename from compiler/testData/readClass/prop/ExtValTIntInClass.kt rename to compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.kt diff --git a/compiler/testData/readClass/prop/ExtVarClass.kt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.kt similarity index 100% rename from compiler/testData/readClass/prop/ExtVarClass.kt rename to compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.kt diff --git a/compiler/testData/readClass/prop/ExtVarInClass.kt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarInClass.kt similarity index 100% rename from compiler/testData/readClass/prop/ExtVarInClass.kt rename to compiler/testData/readKotlinBinaryClass/prop/ExtVarInClass.kt diff --git a/compiler/testData/readClass/prop/ExtVarInt.kt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarInt.kt similarity index 100% rename from compiler/testData/readClass/prop/ExtVarInt.kt rename to compiler/testData/readKotlinBinaryClass/prop/ExtVarInt.kt diff --git a/compiler/testData/readClass/prop/ExtVarIntTInClass.kt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.kt similarity index 100% rename from compiler/testData/readClass/prop/ExtVarIntTInClass.kt rename to compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.kt diff --git a/compiler/testData/readClass/prop/ExtVarIntTQInClass.kt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.kt similarity index 100% rename from compiler/testData/readClass/prop/ExtVarIntTQInClass.kt rename to compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.kt diff --git a/compiler/testData/readClass/prop/ExtVarMapPQInt.kt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.kt similarity index 100% rename from compiler/testData/readClass/prop/ExtVarMapPQInt.kt rename to compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.kt diff --git a/compiler/testData/readClass/prop/ExtVarTIntInClass.kt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.kt similarity index 100% rename from compiler/testData/readClass/prop/ExtVarTIntInClass.kt rename to compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.kt diff --git a/compiler/testData/readClass/prop/ExtVarTQIntInClass.kt b/compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.kt similarity index 100% rename from compiler/testData/readClass/prop/ExtVarTQIntInClass.kt rename to compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.kt diff --git a/compiler/testData/readClass/prop/NsVal.kt b/compiler/testData/readKotlinBinaryClass/prop/NsVal.kt similarity index 100% rename from compiler/testData/readClass/prop/NsVal.kt rename to compiler/testData/readKotlinBinaryClass/prop/NsVal.kt diff --git a/compiler/testData/readClass/prop/NsVar.kt b/compiler/testData/readKotlinBinaryClass/prop/NsVar.kt similarity index 100% rename from compiler/testData/readClass/prop/NsVar.kt rename to compiler/testData/readKotlinBinaryClass/prop/NsVar.kt diff --git a/compiler/testData/readClass/type/ArrayOfCharSequence.kt b/compiler/testData/readKotlinBinaryClass/type/ArrayOfCharSequence.kt similarity index 100% rename from compiler/testData/readClass/type/ArrayOfCharSequence.kt rename to compiler/testData/readKotlinBinaryClass/type/ArrayOfCharSequence.kt diff --git a/compiler/testData/readClass/type/ArrayOfInt.kt b/compiler/testData/readKotlinBinaryClass/type/ArrayOfInt.kt similarity index 100% rename from compiler/testData/readClass/type/ArrayOfInt.kt rename to compiler/testData/readKotlinBinaryClass/type/ArrayOfInt.kt diff --git a/compiler/testData/readClass/type/ArrayOfString.kt b/compiler/testData/readKotlinBinaryClass/type/ArrayOfString.kt similarity index 100% rename from compiler/testData/readClass/type/ArrayOfString.kt rename to compiler/testData/readKotlinBinaryClass/type/ArrayOfString.kt diff --git a/compiler/testData/readClass/type/Int.kt b/compiler/testData/readKotlinBinaryClass/type/Int.kt similarity index 100% rename from compiler/testData/readClass/type/Int.kt rename to compiler/testData/readKotlinBinaryClass/type/Int.kt diff --git a/compiler/testData/readClass/type/IntArray.kt b/compiler/testData/readKotlinBinaryClass/type/IntArray.kt similarity index 100% rename from compiler/testData/readClass/type/IntArray.kt rename to compiler/testData/readKotlinBinaryClass/type/IntArray.kt diff --git a/compiler/testData/readClass/type/IntQ.kt b/compiler/testData/readKotlinBinaryClass/type/IntQ.kt similarity index 100% rename from compiler/testData/readClass/type/IntQ.kt rename to compiler/testData/readKotlinBinaryClass/type/IntQ.kt diff --git a/compiler/testData/readClass/type/ListOfString.kt b/compiler/testData/readKotlinBinaryClass/type/ListOfString.kt similarity index 100% rename from compiler/testData/readClass/type/ListOfString.kt rename to compiler/testData/readKotlinBinaryClass/type/ListOfString.kt diff --git a/compiler/testData/readClass/type/String.kt b/compiler/testData/readKotlinBinaryClass/type/String.kt similarity index 100% rename from compiler/testData/readClass/type/String.kt rename to compiler/testData/readKotlinBinaryClass/type/String.kt diff --git a/compiler/testData/readClass/type/StringQ.kt b/compiler/testData/readKotlinBinaryClass/type/StringQ.kt similarity index 100% rename from compiler/testData/readClass/type/StringQ.kt rename to compiler/testData/readKotlinBinaryClass/type/StringQ.kt diff --git a/compiler/tests/org/jetbrains/jet/ReadClassDataTest.java b/compiler/tests/org/jetbrains/jet/ReadKotlinBinaryClassTest.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/ReadClassDataTest.java rename to compiler/tests/org/jetbrains/jet/ReadKotlinBinaryClassTest.java index 3740d7df4f8..bea9ed9477c 100644 --- a/compiler/tests/org/jetbrains/jet/ReadClassDataTest.java +++ b/compiler/tests/org/jetbrains/jet/ReadKotlinBinaryClassTest.java @@ -55,15 +55,17 @@ import java.util.List; import java.util.Set; /** + * Compile Kotlin and then parse model from .class files. + * * @author Stepan Koltsov */ -public class ReadClassDataTest extends TestCaseWithTmpdir { +public class ReadKotlinBinaryClassTest extends TestCaseWithTmpdir { private JetCoreEnvironment jetCoreEnvironment; private final File testFile; - public ReadClassDataTest(@NotNull File testFile) { + public ReadKotlinBinaryClassTest(@NotNull File testFile) { this.testFile = testFile; setName(testFile.getName()); } @@ -527,11 +529,11 @@ public class ReadClassDataTest extends TestCaseWithTmpdir { } public static Test suite() { - return JetTestCaseBuilder.suiteForDirectory(JetTestCaseBuilder.getTestDataPathBase(), "/readClass", true, new JetTestCaseBuilder.NamedTestFactory() { + return JetTestCaseBuilder.suiteForDirectory(JetTestCaseBuilder.getTestDataPathBase(), "/readKotlinBinaryClass", true, new JetTestCaseBuilder.NamedTestFactory() { @NotNull @Override public Test createTest(@NotNull String dataPath, @NotNull String name, @NotNull File file) { - return new ReadClassDataTest(file); + return new ReadKotlinBinaryClassTest(file); } }); }