From ffc56a7c31ccd08df4621ab0ceb1a41bf59d57a1 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 4 Aug 2015 14:52:23 +0300 Subject: [PATCH] Pull Up: Move Kotlin -> Kotlin tests to separate directory --- .../pullUp/{ => k2k}/accidentalOverrides.kt | 0 .../{ => k2k}/accidentalOverrides.kt.messages | 0 .../pullUp/{ => k2k}/clashWithSuper.kt | 0 .../{ => k2k}/clashWithSuper.kt.messages | 0 .../pullUp/{ => k2k}/fromClassToClass.kt | 0 .../{ => k2k}/fromClassToClass.kt.after | 0 .../{ => k2k}/fromClassToClassMakeAbstract.kt | 0 .../fromClassToClassMakeAbstract.kt.after | 0 .../{ => k2k}/fromClassToClassWithGenerics.kt | 0 .../fromClassToClassWithGenerics.kt.after | 0 .../pullUp/{ => k2k}/fromClassToInterface.kt | 0 .../{ => k2k}/fromClassToInterface.kt.after | 0 .../fromClassToInterfaceMakeAbstract.kt | 0 .../fromClassToInterfaceMakeAbstract.kt.after | 0 .../{ => k2k}/implicitCompanionUsages.kt | 0 .../implicitCompanionUsages.kt.after | 0 .../{ => k2k}/inaccessibleMemberUsed.kt | 0 .../inaccessibleMemberUsed.kt.messages | 0 .../{ => k2k}/initializerInConstructor.kt | 0 .../initializerInConstructor.kt.after | 0 .../initializerInMultipleConstructorsEq.kt | 0 ...itializerInMultipleConstructorsEq.kt.after | 0 .../initializerInMultipleConstructorsNonEq.kt | 0 ...alizerInMultipleConstructorsNonEq.kt.after | 0 .../pullUp/{ => k2k}/innerClassToInterface.kt | 0 .../innerClassToInterface.kt.messages | 0 .../{ => k2k}/moveAllSuperInterfaces.kt | 0 .../{ => k2k}/moveAllSuperInterfaces.kt.after | 0 .../moveAllSuperInterfacesWithGenerics.kt | 0 ...oveAllSuperInterfacesWithGenerics.kt.after | 0 .../{ => k2k}/moveSuperInterfaceToItSelf.kt | 0 .../moveSuperInterfaceToItSelf.kt.after | 0 .../pullUp/{ => k2k}/moveSuperInterfaces.kt | 0 .../{ => k2k}/moveSuperInterfaces.kt.after | 0 ...moveSuperInterfacesToEmptySpecifierList.kt | 0 ...perInterfacesToEmptySpecifierList.kt.after | 0 .../multipleInitializersInConstructorsEq.kt | 0 ...tipleInitializersInConstructorsEq.kt.after | 0 .../refactoring/pullUp/{ => k2k}/noCaret.kt | 0 .../pullUp/{ => k2k}/noCaret.kt.messages | 0 .../{ => k2k}/noClashWithAbstractSuper.kt | 0 .../noClashWithAbstractSuper.kt.after | 0 .../{ => k2k}/noInitializationInInterface.kt | 0 .../noInitializationInInterface.kt.after | 0 .../pullUp/{ => k2k}/noSuperClass.kt | 0 .../pullUp/{ => k2k}/noSuperClass.kt.messages | 0 .../pullUp/{ => k2k}/outsideOfClass.kt | 0 .../{ => k2k}/outsideOfClass.kt.messages | 0 .../parametersInPrimaryInitializer.kt | 0 .../parametersInPrimaryInitializer.kt.after | 0 .../{ => k2k}/propertyDependenceSatisfied.kt | 0 .../propertyDependenceSatisfied.kt.after | 0 .../propertyDependenceUnsatisfied.kt | 0 .../propertyDependenceUnsatisfied.kt.after | 0 .../pullUp/{ => k2k}/publicToInterface.kt | 0 .../{ => k2k}/publicToInterface.kt.after | 0 .../pullUp/{ => k2k}/superToThis.kt | 0 .../pullUp/{ => k2k}/superToThis.kt.after | 0 .../pullUp/{ => k2k}/toIndirectSuperClass.kt | 0 .../{ => k2k}/toIndirectSuperClass.kt.after | 0 .../pullUp/{ => k2k}/usedPrivateToClass.kt | 0 .../{ => k2k}/usedPrivateToClass.kt.after | 0 .../pullUp/PullUpTestGenerated.java | 192 +++++++++--------- 63 files changed, 96 insertions(+), 96 deletions(-) rename idea/testData/refactoring/pullUp/{ => k2k}/accidentalOverrides.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/accidentalOverrides.kt.messages (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/clashWithSuper.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/clashWithSuper.kt.messages (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/fromClassToClass.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/fromClassToClass.kt.after (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/fromClassToClassMakeAbstract.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/fromClassToClassMakeAbstract.kt.after (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/fromClassToClassWithGenerics.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/fromClassToClassWithGenerics.kt.after (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/fromClassToInterface.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/fromClassToInterface.kt.after (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/fromClassToInterfaceMakeAbstract.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/fromClassToInterfaceMakeAbstract.kt.after (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/implicitCompanionUsages.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/implicitCompanionUsages.kt.after (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/inaccessibleMemberUsed.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/inaccessibleMemberUsed.kt.messages (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/initializerInConstructor.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/initializerInConstructor.kt.after (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/initializerInMultipleConstructorsEq.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/initializerInMultipleConstructorsEq.kt.after (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/initializerInMultipleConstructorsNonEq.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/initializerInMultipleConstructorsNonEq.kt.after (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/innerClassToInterface.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/innerClassToInterface.kt.messages (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/moveAllSuperInterfaces.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/moveAllSuperInterfaces.kt.after (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/moveAllSuperInterfacesWithGenerics.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/moveAllSuperInterfacesWithGenerics.kt.after (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/moveSuperInterfaceToItSelf.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/moveSuperInterfaceToItSelf.kt.after (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/moveSuperInterfaces.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/moveSuperInterfaces.kt.after (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/moveSuperInterfacesToEmptySpecifierList.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/moveSuperInterfacesToEmptySpecifierList.kt.after (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/multipleInitializersInConstructorsEq.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/multipleInitializersInConstructorsEq.kt.after (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/noCaret.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/noCaret.kt.messages (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/noClashWithAbstractSuper.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/noClashWithAbstractSuper.kt.after (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/noInitializationInInterface.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/noInitializationInInterface.kt.after (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/noSuperClass.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/noSuperClass.kt.messages (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/outsideOfClass.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/outsideOfClass.kt.messages (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/parametersInPrimaryInitializer.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/parametersInPrimaryInitializer.kt.after (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/propertyDependenceSatisfied.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/propertyDependenceSatisfied.kt.after (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/propertyDependenceUnsatisfied.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/propertyDependenceUnsatisfied.kt.after (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/publicToInterface.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/publicToInterface.kt.after (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/superToThis.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/superToThis.kt.after (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/toIndirectSuperClass.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/toIndirectSuperClass.kt.after (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/usedPrivateToClass.kt (100%) rename idea/testData/refactoring/pullUp/{ => k2k}/usedPrivateToClass.kt.after (100%) diff --git a/idea/testData/refactoring/pullUp/accidentalOverrides.kt b/idea/testData/refactoring/pullUp/k2k/accidentalOverrides.kt similarity index 100% rename from idea/testData/refactoring/pullUp/accidentalOverrides.kt rename to idea/testData/refactoring/pullUp/k2k/accidentalOverrides.kt diff --git a/idea/testData/refactoring/pullUp/accidentalOverrides.kt.messages b/idea/testData/refactoring/pullUp/k2k/accidentalOverrides.kt.messages similarity index 100% rename from idea/testData/refactoring/pullUp/accidentalOverrides.kt.messages rename to idea/testData/refactoring/pullUp/k2k/accidentalOverrides.kt.messages diff --git a/idea/testData/refactoring/pullUp/clashWithSuper.kt b/idea/testData/refactoring/pullUp/k2k/clashWithSuper.kt similarity index 100% rename from idea/testData/refactoring/pullUp/clashWithSuper.kt rename to idea/testData/refactoring/pullUp/k2k/clashWithSuper.kt diff --git a/idea/testData/refactoring/pullUp/clashWithSuper.kt.messages b/idea/testData/refactoring/pullUp/k2k/clashWithSuper.kt.messages similarity index 100% rename from idea/testData/refactoring/pullUp/clashWithSuper.kt.messages rename to idea/testData/refactoring/pullUp/k2k/clashWithSuper.kt.messages diff --git a/idea/testData/refactoring/pullUp/fromClassToClass.kt b/idea/testData/refactoring/pullUp/k2k/fromClassToClass.kt similarity index 100% rename from idea/testData/refactoring/pullUp/fromClassToClass.kt rename to idea/testData/refactoring/pullUp/k2k/fromClassToClass.kt diff --git a/idea/testData/refactoring/pullUp/fromClassToClass.kt.after b/idea/testData/refactoring/pullUp/k2k/fromClassToClass.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/fromClassToClass.kt.after rename to idea/testData/refactoring/pullUp/k2k/fromClassToClass.kt.after diff --git a/idea/testData/refactoring/pullUp/fromClassToClassMakeAbstract.kt b/idea/testData/refactoring/pullUp/k2k/fromClassToClassMakeAbstract.kt similarity index 100% rename from idea/testData/refactoring/pullUp/fromClassToClassMakeAbstract.kt rename to idea/testData/refactoring/pullUp/k2k/fromClassToClassMakeAbstract.kt diff --git a/idea/testData/refactoring/pullUp/fromClassToClassMakeAbstract.kt.after b/idea/testData/refactoring/pullUp/k2k/fromClassToClassMakeAbstract.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/fromClassToClassMakeAbstract.kt.after rename to idea/testData/refactoring/pullUp/k2k/fromClassToClassMakeAbstract.kt.after diff --git a/idea/testData/refactoring/pullUp/fromClassToClassWithGenerics.kt b/idea/testData/refactoring/pullUp/k2k/fromClassToClassWithGenerics.kt similarity index 100% rename from idea/testData/refactoring/pullUp/fromClassToClassWithGenerics.kt rename to idea/testData/refactoring/pullUp/k2k/fromClassToClassWithGenerics.kt diff --git a/idea/testData/refactoring/pullUp/fromClassToClassWithGenerics.kt.after b/idea/testData/refactoring/pullUp/k2k/fromClassToClassWithGenerics.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/fromClassToClassWithGenerics.kt.after rename to idea/testData/refactoring/pullUp/k2k/fromClassToClassWithGenerics.kt.after diff --git a/idea/testData/refactoring/pullUp/fromClassToInterface.kt b/idea/testData/refactoring/pullUp/k2k/fromClassToInterface.kt similarity index 100% rename from idea/testData/refactoring/pullUp/fromClassToInterface.kt rename to idea/testData/refactoring/pullUp/k2k/fromClassToInterface.kt diff --git a/idea/testData/refactoring/pullUp/fromClassToInterface.kt.after b/idea/testData/refactoring/pullUp/k2k/fromClassToInterface.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/fromClassToInterface.kt.after rename to idea/testData/refactoring/pullUp/k2k/fromClassToInterface.kt.after diff --git a/idea/testData/refactoring/pullUp/fromClassToInterfaceMakeAbstract.kt b/idea/testData/refactoring/pullUp/k2k/fromClassToInterfaceMakeAbstract.kt similarity index 100% rename from idea/testData/refactoring/pullUp/fromClassToInterfaceMakeAbstract.kt rename to idea/testData/refactoring/pullUp/k2k/fromClassToInterfaceMakeAbstract.kt diff --git a/idea/testData/refactoring/pullUp/fromClassToInterfaceMakeAbstract.kt.after b/idea/testData/refactoring/pullUp/k2k/fromClassToInterfaceMakeAbstract.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/fromClassToInterfaceMakeAbstract.kt.after rename to idea/testData/refactoring/pullUp/k2k/fromClassToInterfaceMakeAbstract.kt.after diff --git a/idea/testData/refactoring/pullUp/implicitCompanionUsages.kt b/idea/testData/refactoring/pullUp/k2k/implicitCompanionUsages.kt similarity index 100% rename from idea/testData/refactoring/pullUp/implicitCompanionUsages.kt rename to idea/testData/refactoring/pullUp/k2k/implicitCompanionUsages.kt diff --git a/idea/testData/refactoring/pullUp/implicitCompanionUsages.kt.after b/idea/testData/refactoring/pullUp/k2k/implicitCompanionUsages.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/implicitCompanionUsages.kt.after rename to idea/testData/refactoring/pullUp/k2k/implicitCompanionUsages.kt.after diff --git a/idea/testData/refactoring/pullUp/inaccessibleMemberUsed.kt b/idea/testData/refactoring/pullUp/k2k/inaccessibleMemberUsed.kt similarity index 100% rename from idea/testData/refactoring/pullUp/inaccessibleMemberUsed.kt rename to idea/testData/refactoring/pullUp/k2k/inaccessibleMemberUsed.kt diff --git a/idea/testData/refactoring/pullUp/inaccessibleMemberUsed.kt.messages b/idea/testData/refactoring/pullUp/k2k/inaccessibleMemberUsed.kt.messages similarity index 100% rename from idea/testData/refactoring/pullUp/inaccessibleMemberUsed.kt.messages rename to idea/testData/refactoring/pullUp/k2k/inaccessibleMemberUsed.kt.messages diff --git a/idea/testData/refactoring/pullUp/initializerInConstructor.kt b/idea/testData/refactoring/pullUp/k2k/initializerInConstructor.kt similarity index 100% rename from idea/testData/refactoring/pullUp/initializerInConstructor.kt rename to idea/testData/refactoring/pullUp/k2k/initializerInConstructor.kt diff --git a/idea/testData/refactoring/pullUp/initializerInConstructor.kt.after b/idea/testData/refactoring/pullUp/k2k/initializerInConstructor.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/initializerInConstructor.kt.after rename to idea/testData/refactoring/pullUp/k2k/initializerInConstructor.kt.after diff --git a/idea/testData/refactoring/pullUp/initializerInMultipleConstructorsEq.kt b/idea/testData/refactoring/pullUp/k2k/initializerInMultipleConstructorsEq.kt similarity index 100% rename from idea/testData/refactoring/pullUp/initializerInMultipleConstructorsEq.kt rename to idea/testData/refactoring/pullUp/k2k/initializerInMultipleConstructorsEq.kt diff --git a/idea/testData/refactoring/pullUp/initializerInMultipleConstructorsEq.kt.after b/idea/testData/refactoring/pullUp/k2k/initializerInMultipleConstructorsEq.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/initializerInMultipleConstructorsEq.kt.after rename to idea/testData/refactoring/pullUp/k2k/initializerInMultipleConstructorsEq.kt.after diff --git a/idea/testData/refactoring/pullUp/initializerInMultipleConstructorsNonEq.kt b/idea/testData/refactoring/pullUp/k2k/initializerInMultipleConstructorsNonEq.kt similarity index 100% rename from idea/testData/refactoring/pullUp/initializerInMultipleConstructorsNonEq.kt rename to idea/testData/refactoring/pullUp/k2k/initializerInMultipleConstructorsNonEq.kt diff --git a/idea/testData/refactoring/pullUp/initializerInMultipleConstructorsNonEq.kt.after b/idea/testData/refactoring/pullUp/k2k/initializerInMultipleConstructorsNonEq.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/initializerInMultipleConstructorsNonEq.kt.after rename to idea/testData/refactoring/pullUp/k2k/initializerInMultipleConstructorsNonEq.kt.after diff --git a/idea/testData/refactoring/pullUp/innerClassToInterface.kt b/idea/testData/refactoring/pullUp/k2k/innerClassToInterface.kt similarity index 100% rename from idea/testData/refactoring/pullUp/innerClassToInterface.kt rename to idea/testData/refactoring/pullUp/k2k/innerClassToInterface.kt diff --git a/idea/testData/refactoring/pullUp/innerClassToInterface.kt.messages b/idea/testData/refactoring/pullUp/k2k/innerClassToInterface.kt.messages similarity index 100% rename from idea/testData/refactoring/pullUp/innerClassToInterface.kt.messages rename to idea/testData/refactoring/pullUp/k2k/innerClassToInterface.kt.messages diff --git a/idea/testData/refactoring/pullUp/moveAllSuperInterfaces.kt b/idea/testData/refactoring/pullUp/k2k/moveAllSuperInterfaces.kt similarity index 100% rename from idea/testData/refactoring/pullUp/moveAllSuperInterfaces.kt rename to idea/testData/refactoring/pullUp/k2k/moveAllSuperInterfaces.kt diff --git a/idea/testData/refactoring/pullUp/moveAllSuperInterfaces.kt.after b/idea/testData/refactoring/pullUp/k2k/moveAllSuperInterfaces.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/moveAllSuperInterfaces.kt.after rename to idea/testData/refactoring/pullUp/k2k/moveAllSuperInterfaces.kt.after diff --git a/idea/testData/refactoring/pullUp/moveAllSuperInterfacesWithGenerics.kt b/idea/testData/refactoring/pullUp/k2k/moveAllSuperInterfacesWithGenerics.kt similarity index 100% rename from idea/testData/refactoring/pullUp/moveAllSuperInterfacesWithGenerics.kt rename to idea/testData/refactoring/pullUp/k2k/moveAllSuperInterfacesWithGenerics.kt diff --git a/idea/testData/refactoring/pullUp/moveAllSuperInterfacesWithGenerics.kt.after b/idea/testData/refactoring/pullUp/k2k/moveAllSuperInterfacesWithGenerics.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/moveAllSuperInterfacesWithGenerics.kt.after rename to idea/testData/refactoring/pullUp/k2k/moveAllSuperInterfacesWithGenerics.kt.after diff --git a/idea/testData/refactoring/pullUp/moveSuperInterfaceToItSelf.kt b/idea/testData/refactoring/pullUp/k2k/moveSuperInterfaceToItSelf.kt similarity index 100% rename from idea/testData/refactoring/pullUp/moveSuperInterfaceToItSelf.kt rename to idea/testData/refactoring/pullUp/k2k/moveSuperInterfaceToItSelf.kt diff --git a/idea/testData/refactoring/pullUp/moveSuperInterfaceToItSelf.kt.after b/idea/testData/refactoring/pullUp/k2k/moveSuperInterfaceToItSelf.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/moveSuperInterfaceToItSelf.kt.after rename to idea/testData/refactoring/pullUp/k2k/moveSuperInterfaceToItSelf.kt.after diff --git a/idea/testData/refactoring/pullUp/moveSuperInterfaces.kt b/idea/testData/refactoring/pullUp/k2k/moveSuperInterfaces.kt similarity index 100% rename from idea/testData/refactoring/pullUp/moveSuperInterfaces.kt rename to idea/testData/refactoring/pullUp/k2k/moveSuperInterfaces.kt diff --git a/idea/testData/refactoring/pullUp/moveSuperInterfaces.kt.after b/idea/testData/refactoring/pullUp/k2k/moveSuperInterfaces.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/moveSuperInterfaces.kt.after rename to idea/testData/refactoring/pullUp/k2k/moveSuperInterfaces.kt.after diff --git a/idea/testData/refactoring/pullUp/moveSuperInterfacesToEmptySpecifierList.kt b/idea/testData/refactoring/pullUp/k2k/moveSuperInterfacesToEmptySpecifierList.kt similarity index 100% rename from idea/testData/refactoring/pullUp/moveSuperInterfacesToEmptySpecifierList.kt rename to idea/testData/refactoring/pullUp/k2k/moveSuperInterfacesToEmptySpecifierList.kt diff --git a/idea/testData/refactoring/pullUp/moveSuperInterfacesToEmptySpecifierList.kt.after b/idea/testData/refactoring/pullUp/k2k/moveSuperInterfacesToEmptySpecifierList.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/moveSuperInterfacesToEmptySpecifierList.kt.after rename to idea/testData/refactoring/pullUp/k2k/moveSuperInterfacesToEmptySpecifierList.kt.after diff --git a/idea/testData/refactoring/pullUp/multipleInitializersInConstructorsEq.kt b/idea/testData/refactoring/pullUp/k2k/multipleInitializersInConstructorsEq.kt similarity index 100% rename from idea/testData/refactoring/pullUp/multipleInitializersInConstructorsEq.kt rename to idea/testData/refactoring/pullUp/k2k/multipleInitializersInConstructorsEq.kt diff --git a/idea/testData/refactoring/pullUp/multipleInitializersInConstructorsEq.kt.after b/idea/testData/refactoring/pullUp/k2k/multipleInitializersInConstructorsEq.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/multipleInitializersInConstructorsEq.kt.after rename to idea/testData/refactoring/pullUp/k2k/multipleInitializersInConstructorsEq.kt.after diff --git a/idea/testData/refactoring/pullUp/noCaret.kt b/idea/testData/refactoring/pullUp/k2k/noCaret.kt similarity index 100% rename from idea/testData/refactoring/pullUp/noCaret.kt rename to idea/testData/refactoring/pullUp/k2k/noCaret.kt diff --git a/idea/testData/refactoring/pullUp/noCaret.kt.messages b/idea/testData/refactoring/pullUp/k2k/noCaret.kt.messages similarity index 100% rename from idea/testData/refactoring/pullUp/noCaret.kt.messages rename to idea/testData/refactoring/pullUp/k2k/noCaret.kt.messages diff --git a/idea/testData/refactoring/pullUp/noClashWithAbstractSuper.kt b/idea/testData/refactoring/pullUp/k2k/noClashWithAbstractSuper.kt similarity index 100% rename from idea/testData/refactoring/pullUp/noClashWithAbstractSuper.kt rename to idea/testData/refactoring/pullUp/k2k/noClashWithAbstractSuper.kt diff --git a/idea/testData/refactoring/pullUp/noClashWithAbstractSuper.kt.after b/idea/testData/refactoring/pullUp/k2k/noClashWithAbstractSuper.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/noClashWithAbstractSuper.kt.after rename to idea/testData/refactoring/pullUp/k2k/noClashWithAbstractSuper.kt.after diff --git a/idea/testData/refactoring/pullUp/noInitializationInInterface.kt b/idea/testData/refactoring/pullUp/k2k/noInitializationInInterface.kt similarity index 100% rename from idea/testData/refactoring/pullUp/noInitializationInInterface.kt rename to idea/testData/refactoring/pullUp/k2k/noInitializationInInterface.kt diff --git a/idea/testData/refactoring/pullUp/noInitializationInInterface.kt.after b/idea/testData/refactoring/pullUp/k2k/noInitializationInInterface.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/noInitializationInInterface.kt.after rename to idea/testData/refactoring/pullUp/k2k/noInitializationInInterface.kt.after diff --git a/idea/testData/refactoring/pullUp/noSuperClass.kt b/idea/testData/refactoring/pullUp/k2k/noSuperClass.kt similarity index 100% rename from idea/testData/refactoring/pullUp/noSuperClass.kt rename to idea/testData/refactoring/pullUp/k2k/noSuperClass.kt diff --git a/idea/testData/refactoring/pullUp/noSuperClass.kt.messages b/idea/testData/refactoring/pullUp/k2k/noSuperClass.kt.messages similarity index 100% rename from idea/testData/refactoring/pullUp/noSuperClass.kt.messages rename to idea/testData/refactoring/pullUp/k2k/noSuperClass.kt.messages diff --git a/idea/testData/refactoring/pullUp/outsideOfClass.kt b/idea/testData/refactoring/pullUp/k2k/outsideOfClass.kt similarity index 100% rename from idea/testData/refactoring/pullUp/outsideOfClass.kt rename to idea/testData/refactoring/pullUp/k2k/outsideOfClass.kt diff --git a/idea/testData/refactoring/pullUp/outsideOfClass.kt.messages b/idea/testData/refactoring/pullUp/k2k/outsideOfClass.kt.messages similarity index 100% rename from idea/testData/refactoring/pullUp/outsideOfClass.kt.messages rename to idea/testData/refactoring/pullUp/k2k/outsideOfClass.kt.messages diff --git a/idea/testData/refactoring/pullUp/parametersInPrimaryInitializer.kt b/idea/testData/refactoring/pullUp/k2k/parametersInPrimaryInitializer.kt similarity index 100% rename from idea/testData/refactoring/pullUp/parametersInPrimaryInitializer.kt rename to idea/testData/refactoring/pullUp/k2k/parametersInPrimaryInitializer.kt diff --git a/idea/testData/refactoring/pullUp/parametersInPrimaryInitializer.kt.after b/idea/testData/refactoring/pullUp/k2k/parametersInPrimaryInitializer.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/parametersInPrimaryInitializer.kt.after rename to idea/testData/refactoring/pullUp/k2k/parametersInPrimaryInitializer.kt.after diff --git a/idea/testData/refactoring/pullUp/propertyDependenceSatisfied.kt b/idea/testData/refactoring/pullUp/k2k/propertyDependenceSatisfied.kt similarity index 100% rename from idea/testData/refactoring/pullUp/propertyDependenceSatisfied.kt rename to idea/testData/refactoring/pullUp/k2k/propertyDependenceSatisfied.kt diff --git a/idea/testData/refactoring/pullUp/propertyDependenceSatisfied.kt.after b/idea/testData/refactoring/pullUp/k2k/propertyDependenceSatisfied.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/propertyDependenceSatisfied.kt.after rename to idea/testData/refactoring/pullUp/k2k/propertyDependenceSatisfied.kt.after diff --git a/idea/testData/refactoring/pullUp/propertyDependenceUnsatisfied.kt b/idea/testData/refactoring/pullUp/k2k/propertyDependenceUnsatisfied.kt similarity index 100% rename from idea/testData/refactoring/pullUp/propertyDependenceUnsatisfied.kt rename to idea/testData/refactoring/pullUp/k2k/propertyDependenceUnsatisfied.kt diff --git a/idea/testData/refactoring/pullUp/propertyDependenceUnsatisfied.kt.after b/idea/testData/refactoring/pullUp/k2k/propertyDependenceUnsatisfied.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/propertyDependenceUnsatisfied.kt.after rename to idea/testData/refactoring/pullUp/k2k/propertyDependenceUnsatisfied.kt.after diff --git a/idea/testData/refactoring/pullUp/publicToInterface.kt b/idea/testData/refactoring/pullUp/k2k/publicToInterface.kt similarity index 100% rename from idea/testData/refactoring/pullUp/publicToInterface.kt rename to idea/testData/refactoring/pullUp/k2k/publicToInterface.kt diff --git a/idea/testData/refactoring/pullUp/publicToInterface.kt.after b/idea/testData/refactoring/pullUp/k2k/publicToInterface.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/publicToInterface.kt.after rename to idea/testData/refactoring/pullUp/k2k/publicToInterface.kt.after diff --git a/idea/testData/refactoring/pullUp/superToThis.kt b/idea/testData/refactoring/pullUp/k2k/superToThis.kt similarity index 100% rename from idea/testData/refactoring/pullUp/superToThis.kt rename to idea/testData/refactoring/pullUp/k2k/superToThis.kt diff --git a/idea/testData/refactoring/pullUp/superToThis.kt.after b/idea/testData/refactoring/pullUp/k2k/superToThis.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/superToThis.kt.after rename to idea/testData/refactoring/pullUp/k2k/superToThis.kt.after diff --git a/idea/testData/refactoring/pullUp/toIndirectSuperClass.kt b/idea/testData/refactoring/pullUp/k2k/toIndirectSuperClass.kt similarity index 100% rename from idea/testData/refactoring/pullUp/toIndirectSuperClass.kt rename to idea/testData/refactoring/pullUp/k2k/toIndirectSuperClass.kt diff --git a/idea/testData/refactoring/pullUp/toIndirectSuperClass.kt.after b/idea/testData/refactoring/pullUp/k2k/toIndirectSuperClass.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/toIndirectSuperClass.kt.after rename to idea/testData/refactoring/pullUp/k2k/toIndirectSuperClass.kt.after diff --git a/idea/testData/refactoring/pullUp/usedPrivateToClass.kt b/idea/testData/refactoring/pullUp/k2k/usedPrivateToClass.kt similarity index 100% rename from idea/testData/refactoring/pullUp/usedPrivateToClass.kt rename to idea/testData/refactoring/pullUp/k2k/usedPrivateToClass.kt diff --git a/idea/testData/refactoring/pullUp/usedPrivateToClass.kt.after b/idea/testData/refactoring/pullUp/k2k/usedPrivateToClass.kt.after similarity index 100% rename from idea/testData/refactoring/pullUp/usedPrivateToClass.kt.after rename to idea/testData/refactoring/pullUp/k2k/usedPrivateToClass.kt.after diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/pullUp/PullUpTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/pullUp/PullUpTestGenerated.java index cfb7bb73dd8..19e6f4d4c76 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/pullUp/PullUpTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/pullUp/PullUpTestGenerated.java @@ -31,193 +31,193 @@ import java.util.regex.Pattern; @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public class PullUpTestGenerated extends AbstractPullUpTest { - @TestMetadata("accidentalOverrides.kt") - public void testAccidentalOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/accidentalOverrides.kt"); - doTest(fileName); - } - public void testAllFilesPresentInPullUp() throws Exception { JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/refactoring/pullUp"), Pattern.compile("^(.+)\\.kt$")); } - @TestMetadata("clashWithSuper.kt") - public void testClashWithSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/clashWithSuper.kt"); + @TestMetadata("k2k/accidentalOverrides.kt") + public void testK2k_AccidentalOverrides() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/accidentalOverrides.kt"); doTest(fileName); } - @TestMetadata("fromClassToClass.kt") - public void testFromClassToClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/fromClassToClass.kt"); + @TestMetadata("k2k/clashWithSuper.kt") + public void testK2k_ClashWithSuper() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/clashWithSuper.kt"); doTest(fileName); } - @TestMetadata("fromClassToClassMakeAbstract.kt") - public void testFromClassToClassMakeAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/fromClassToClassMakeAbstract.kt"); + @TestMetadata("k2k/fromClassToClass.kt") + public void testK2k_FromClassToClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/fromClassToClass.kt"); doTest(fileName); } - @TestMetadata("fromClassToClassWithGenerics.kt") - public void testFromClassToClassWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/fromClassToClassWithGenerics.kt"); + @TestMetadata("k2k/fromClassToClassMakeAbstract.kt") + public void testK2k_FromClassToClassMakeAbstract() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/fromClassToClassMakeAbstract.kt"); doTest(fileName); } - @TestMetadata("fromClassToInterface.kt") - public void testFromClassToInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/fromClassToInterface.kt"); + @TestMetadata("k2k/fromClassToClassWithGenerics.kt") + public void testK2k_FromClassToClassWithGenerics() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/fromClassToClassWithGenerics.kt"); doTest(fileName); } - @TestMetadata("fromClassToInterfaceMakeAbstract.kt") - public void testFromClassToInterfaceMakeAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/fromClassToInterfaceMakeAbstract.kt"); + @TestMetadata("k2k/fromClassToInterface.kt") + public void testK2k_FromClassToInterface() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/fromClassToInterface.kt"); doTest(fileName); } - @TestMetadata("implicitCompanionUsages.kt") - public void testImplicitCompanionUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/implicitCompanionUsages.kt"); + @TestMetadata("k2k/fromClassToInterfaceMakeAbstract.kt") + public void testK2k_FromClassToInterfaceMakeAbstract() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/fromClassToInterfaceMakeAbstract.kt"); doTest(fileName); } - @TestMetadata("inaccessibleMemberUsed.kt") - public void testInaccessibleMemberUsed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/inaccessibleMemberUsed.kt"); + @TestMetadata("k2k/implicitCompanionUsages.kt") + public void testK2k_ImplicitCompanionUsages() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/implicitCompanionUsages.kt"); doTest(fileName); } - @TestMetadata("initializerInConstructor.kt") - public void testInitializerInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/initializerInConstructor.kt"); + @TestMetadata("k2k/inaccessibleMemberUsed.kt") + public void testK2k_InaccessibleMemberUsed() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/inaccessibleMemberUsed.kt"); doTest(fileName); } - @TestMetadata("initializerInMultipleConstructorsEq.kt") - public void testInitializerInMultipleConstructorsEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/initializerInMultipleConstructorsEq.kt"); + @TestMetadata("k2k/initializerInConstructor.kt") + public void testK2k_InitializerInConstructor() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/initializerInConstructor.kt"); doTest(fileName); } - @TestMetadata("initializerInMultipleConstructorsNonEq.kt") - public void testInitializerInMultipleConstructorsNonEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/initializerInMultipleConstructorsNonEq.kt"); + @TestMetadata("k2k/initializerInMultipleConstructorsEq.kt") + public void testK2k_InitializerInMultipleConstructorsEq() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/initializerInMultipleConstructorsEq.kt"); doTest(fileName); } - @TestMetadata("innerClassToInterface.kt") - public void testInnerClassToInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/innerClassToInterface.kt"); + @TestMetadata("k2k/initializerInMultipleConstructorsNonEq.kt") + public void testK2k_InitializerInMultipleConstructorsNonEq() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/initializerInMultipleConstructorsNonEq.kt"); doTest(fileName); } - @TestMetadata("moveAllSuperInterfaces.kt") - public void testMoveAllSuperInterfaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/moveAllSuperInterfaces.kt"); + @TestMetadata("k2k/innerClassToInterface.kt") + public void testK2k_InnerClassToInterface() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/innerClassToInterface.kt"); doTest(fileName); } - @TestMetadata("moveAllSuperInterfacesWithGenerics.kt") - public void testMoveAllSuperInterfacesWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/moveAllSuperInterfacesWithGenerics.kt"); + @TestMetadata("k2k/moveAllSuperInterfaces.kt") + public void testK2k_MoveAllSuperInterfaces() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/moveAllSuperInterfaces.kt"); doTest(fileName); } - @TestMetadata("moveSuperInterfaces.kt") - public void testMoveSuperInterfaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/moveSuperInterfaces.kt"); + @TestMetadata("k2k/moveAllSuperInterfacesWithGenerics.kt") + public void testK2k_MoveAllSuperInterfacesWithGenerics() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/moveAllSuperInterfacesWithGenerics.kt"); doTest(fileName); } - @TestMetadata("moveSuperInterfacesToEmptySpecifierList.kt") - public void testMoveSuperInterfacesToEmptySpecifierList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/moveSuperInterfacesToEmptySpecifierList.kt"); + @TestMetadata("k2k/moveSuperInterfaces.kt") + public void testK2k_MoveSuperInterfaces() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/moveSuperInterfaces.kt"); doTest(fileName); } - @TestMetadata("moveSuperInterfaceToItSelf.kt") - public void testMoveSuperInterfaceToItSelf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/moveSuperInterfaceToItSelf.kt"); + @TestMetadata("k2k/moveSuperInterfacesToEmptySpecifierList.kt") + public void testK2k_MoveSuperInterfacesToEmptySpecifierList() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/moveSuperInterfacesToEmptySpecifierList.kt"); doTest(fileName); } - @TestMetadata("multipleInitializersInConstructorsEq.kt") - public void testMultipleInitializersInConstructorsEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/multipleInitializersInConstructorsEq.kt"); + @TestMetadata("k2k/moveSuperInterfaceToItSelf.kt") + public void testK2k_MoveSuperInterfaceToItSelf() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/moveSuperInterfaceToItSelf.kt"); doTest(fileName); } - @TestMetadata("noCaret.kt") - public void testNoCaret() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/noCaret.kt"); + @TestMetadata("k2k/multipleInitializersInConstructorsEq.kt") + public void testK2k_MultipleInitializersInConstructorsEq() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/multipleInitializersInConstructorsEq.kt"); doTest(fileName); } - @TestMetadata("noClashWithAbstractSuper.kt") - public void testNoClashWithAbstractSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/noClashWithAbstractSuper.kt"); + @TestMetadata("k2k/noCaret.kt") + public void testK2k_NoCaret() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/noCaret.kt"); doTest(fileName); } - @TestMetadata("noInitializationInInterface.kt") - public void testNoInitializationInInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/noInitializationInInterface.kt"); + @TestMetadata("k2k/noClashWithAbstractSuper.kt") + public void testK2k_NoClashWithAbstractSuper() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/noClashWithAbstractSuper.kt"); doTest(fileName); } - @TestMetadata("noSuperClass.kt") - public void testNoSuperClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/noSuperClass.kt"); + @TestMetadata("k2k/noInitializationInInterface.kt") + public void testK2k_NoInitializationInInterface() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/noInitializationInInterface.kt"); doTest(fileName); } - @TestMetadata("outsideOfClass.kt") - public void testOutsideOfClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/outsideOfClass.kt"); + @TestMetadata("k2k/noSuperClass.kt") + public void testK2k_NoSuperClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/noSuperClass.kt"); doTest(fileName); } - @TestMetadata("parametersInPrimaryInitializer.kt") - public void testParametersInPrimaryInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/parametersInPrimaryInitializer.kt"); + @TestMetadata("k2k/outsideOfClass.kt") + public void testK2k_OutsideOfClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/outsideOfClass.kt"); doTest(fileName); } - @TestMetadata("propertyDependenceSatisfied.kt") - public void testPropertyDependenceSatisfied() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/propertyDependenceSatisfied.kt"); + @TestMetadata("k2k/parametersInPrimaryInitializer.kt") + public void testK2k_ParametersInPrimaryInitializer() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/parametersInPrimaryInitializer.kt"); doTest(fileName); } - @TestMetadata("propertyDependenceUnsatisfied.kt") - public void testPropertyDependenceUnsatisfied() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/propertyDependenceUnsatisfied.kt"); + @TestMetadata("k2k/propertyDependenceSatisfied.kt") + public void testK2k_PropertyDependenceSatisfied() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/propertyDependenceSatisfied.kt"); doTest(fileName); } - @TestMetadata("publicToInterface.kt") - public void testPublicToInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/publicToInterface.kt"); + @TestMetadata("k2k/propertyDependenceUnsatisfied.kt") + public void testK2k_PropertyDependenceUnsatisfied() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/propertyDependenceUnsatisfied.kt"); doTest(fileName); } - @TestMetadata("superToThis.kt") - public void testSuperToThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/superToThis.kt"); + @TestMetadata("k2k/publicToInterface.kt") + public void testK2k_PublicToInterface() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/publicToInterface.kt"); doTest(fileName); } - @TestMetadata("toIndirectSuperClass.kt") - public void testToIndirectSuperClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/toIndirectSuperClass.kt"); + @TestMetadata("k2k/superToThis.kt") + public void testK2k_SuperToThis() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/superToThis.kt"); doTest(fileName); } - @TestMetadata("usedPrivateToClass.kt") - public void testUsedPrivateToClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/usedPrivateToClass.kt"); + @TestMetadata("k2k/toIndirectSuperClass.kt") + public void testK2k_ToIndirectSuperClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/toIndirectSuperClass.kt"); + doTest(fileName); + } + + @TestMetadata("k2k/usedPrivateToClass.kt") + public void testK2k_UsedPrivateToClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/usedPrivateToClass.kt"); doTest(fileName); } }