diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index fdcca56b274..517bc3f54fa 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -127,7 +127,7 @@ import org.jetbrains.kotlin.resolve.calls.AbstractResolvedCallsTest import org.jetbrains.kotlin.resolve.calls.AbstractResolvedConstructorDelegationCallsTests import org.jetbrains.kotlin.resolve.constants.evaluate.AbstractCompileTimeConstantEvaluatorTest import org.jetbrains.kotlin.resolve.constraintSystem.AbstractConstraintSystemTest -import org.jetbrains.kotlin.safeDelete.AbstractSafeDeleteTest +import org.jetbrains.kotlin.idea.refactoring.safeDelete.AbstractSafeDeleteTest import org.jetbrains.kotlin.serialization.AbstractLocalClassProtoTest import org.jetbrains.kotlin.shortenRefs.AbstractShortenRefsTest import org.jetbrains.kotlin.types.AbstractTypeBindingTest @@ -521,19 +521,19 @@ fun main(args: Array) { } testClass() { - model("safeDelete/deleteClass/kotlinClass", testMethod = "doClassTest") - model("safeDelete/deleteClass/kotlinClassWithJava", testMethod = "doClassTestWithJava") - model("safeDelete/deleteObject/kotlinObject", testMethod = "doObjectTest") - model("safeDelete/deleteFunction/kotlinFunction", testMethod = "doFunctionTest") - model("safeDelete/deleteFunction/kotlinFunctionWithJava", testMethod = "doFunctionTestWithJava") - model("safeDelete/deleteFunction/javaFunctionWithKotlin", testMethod = "doJavaMethodTest") - model("safeDelete/deleteProperty/kotlinProperty", testMethod = "doPropertyTest") - model("safeDelete/deleteProperty/kotlinPropertyWithJava", testMethod = "doPropertyTestWithJava") - model("safeDelete/deleteProperty/javaPropertyWithKotlin", testMethod = "doJavaPropertyTest") - model("safeDelete/deleteTypeParameter/kotlinTypeParameter", testMethod = "doTypeParameterTest") - model("safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava", testMethod = "doTypeParameterTestWithJava") - model("safeDelete/deleteValueParameter/kotlinValueParameter", testMethod = "doValueParameterTest") - model("safeDelete/deleteValueParameter/kotlinValueParameterWithJava", testMethod = "doValueParameterTestWithJava") + model("refactoring/safeDelete/deleteClass/kotlinClass", testMethod = "doClassTest") + model("refactoring/safeDelete/deleteClass/kotlinClassWithJava", testMethod = "doClassTestWithJava") + model("refactoring/safeDelete/deleteObject/kotlinObject", testMethod = "doObjectTest") + model("refactoring/safeDelete/deleteFunction/kotlinFunction", testMethod = "doFunctionTest") + model("refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava", testMethod = "doFunctionTestWithJava") + model("refactoring/safeDelete/deleteFunction/javaFunctionWithKotlin", testMethod = "doJavaMethodTest") + model("refactoring/safeDelete/deleteProperty/kotlinProperty", testMethod = "doPropertyTest") + model("refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava", testMethod = "doPropertyTestWithJava") + model("refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin", testMethod = "doJavaPropertyTest") + model("refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter", testMethod = "doTypeParameterTest") + model("refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava", testMethod = "doTypeParameterTestWithJava") + model("refactoring/safeDelete/deleteValueParameter/kotlinValueParameter", testMethod = "doValueParameterTest") + model("refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava", testMethod = "doValueParameterTestWithJava") } testClass() { diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/class1.kt b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/class1.kt similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/class1.kt rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/class1.kt diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/class1.kt.after b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/class1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/class1.kt.after rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/class1.kt.after diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/class2.kt b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/class2.kt similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/class2.kt rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/class2.kt diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/class2.kt.messages b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/class2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/class2.kt.messages rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/class2.kt.messages diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/classInString.kt b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/classInString.kt similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/classInString.kt rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/classInString.kt diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/classInString.kt.messages b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/classInString.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/classInString.kt.messages rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/classInString.kt.messages diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/classWithExternalConstructructorUsage.kt b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/classWithExternalConstructructorUsage.kt similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/classWithExternalConstructructorUsage.kt rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/classWithExternalConstructructorUsage.kt diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/classWithExternalConstructructorUsage.kt.messages b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/classWithExternalConstructructorUsage.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/classWithExternalConstructructorUsage.kt.messages rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/classWithExternalConstructructorUsage.kt.messages diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/classWithInternalConstructructorUsage.kt b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/classWithInternalConstructructorUsage.kt similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/classWithInternalConstructructorUsage.kt rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/classWithInternalConstructructorUsage.kt diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/classWithInternalConstructructorUsage.kt.after b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/classWithInternalConstructructorUsage.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/classWithInternalConstructructorUsage.kt.after rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/classWithInternalConstructructorUsage.kt.after diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/localClass1.kt b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/localClass1.kt similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/localClass1.kt rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/localClass1.kt diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/localClass1.kt.messages b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/localClass1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/localClass1.kt.messages rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/localClass1.kt.messages diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/localClass2.kt b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/localClass2.kt similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/localClass2.kt rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/localClass2.kt diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/localClass2.kt.after b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/localClass2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/localClass2.kt.after rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/localClass2.kt.after diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass1.kt b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/nestedClass1.kt similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass1.kt rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/nestedClass1.kt diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass1.kt.after b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/nestedClass1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass1.kt.after rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/nestedClass1.kt.after diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass2.kt b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/nestedClass2.kt similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass2.kt rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/nestedClass2.kt diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass2.kt.messages b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/nestedClass2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass2.kt.messages rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/nestedClass2.kt.messages diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/noUsages.kt b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/noUsages.kt similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/noUsages.kt rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/noUsages.kt diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/noUsages.kt.after b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/noUsages.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/noUsages.kt.after rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/noUsages.kt.after diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/trait1.kt b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/trait1.kt similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/trait1.kt rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/trait1.kt diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/trait1.kt.after b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/trait1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/trait1.kt.after rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/trait1.kt.after diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/trait2.kt b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/trait2.kt similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/trait2.kt rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/trait2.kt diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/trait2.kt.messages b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/trait2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/trait2.kt.messages rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/trait2.kt.messages diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/unsafeImport.kt b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/unsafeImport.kt similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/unsafeImport.kt rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/unsafeImport.kt diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/unsafeImport.kt.messages b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/unsafeImport.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClass/unsafeImport.kt.messages rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/unsafeImport.kt.messages diff --git a/idea/testData/safeDelete/deleteClass/kotlinClassWithJava/classWithDelegationCalls.java b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClassWithJava/classWithDelegationCalls.java similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClassWithJava/classWithDelegationCalls.java rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClassWithJava/classWithDelegationCalls.java diff --git a/idea/testData/safeDelete/deleteClass/kotlinClassWithJava/classWithDelegationCalls.kt b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClassWithJava/classWithDelegationCalls.kt similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClassWithJava/classWithDelegationCalls.kt rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClassWithJava/classWithDelegationCalls.kt diff --git a/idea/testData/safeDelete/deleteClass/kotlinClassWithJava/classWithDelegationCalls.kt.messages b/idea/testData/refactoring/safeDelete/deleteClass/kotlinClassWithJava/classWithDelegationCalls.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteClass/kotlinClassWithJava/classWithDelegationCalls.kt.messages rename to idea/testData/refactoring/safeDelete/deleteClass/kotlinClassWithJava/classWithDelegationCalls.kt.messages diff --git a/idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.java b/idea/testData/refactoring/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.java similarity index 100% rename from idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.java rename to idea/testData/refactoring/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.java diff --git a/idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.java.after b/idea/testData/refactoring/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.java.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.java.after rename to idea/testData/refactoring/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.java.after diff --git a/idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.kt b/idea/testData/refactoring/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.kt diff --git a/idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.kt.after b/idea/testData/refactoring/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.kt.after rename to idea/testData/refactoring/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.java b/idea/testData/refactoring/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.java similarity index 100% rename from idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.java rename to idea/testData/refactoring/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.java diff --git a/idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.java.after b/idea/testData/refactoring/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.java.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.java.after rename to idea/testData/refactoring/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.java.after diff --git a/idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.kt b/idea/testData/refactoring/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.kt diff --git a/idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.kt.after b/idea/testData/refactoring/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.kt.after rename to idea/testData/refactoring/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/fun1.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/fun1.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/fun1.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/fun1.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/fun1.kt.after b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/fun1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/fun1.kt.after rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/fun1.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/fun2.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/fun2.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/fun2.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/fun2.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/fun2.kt.messages b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/fun2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/fun2.kt.messages rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/fun2.kt.messages diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/funExt1.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/funExt1.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/funExt1.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/funExt1.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/funExt1.kt.after b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/funExt1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/funExt1.kt.after rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/funExt1.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/funExt2.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/funExt2.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/funExt2.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/funExt2.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/funExt2.kt.messages b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/funExt2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/funExt2.kt.messages rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/funExt2.kt.messages diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/implement1.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/implement1.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/implement1.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/implement1.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/implement1.kt.messages b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/implement1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/implement1.kt.messages rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/implement1.kt.messages diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/implement2.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/implement2.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/implement2.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/implement2.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/implement2.kt.messages b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/implement2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/implement2.kt.messages rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/implement2.kt.messages diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/localFun1.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/localFun1.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/localFun1.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/localFun1.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/localFun1.kt.messages b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/localFun1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/localFun1.kt.messages rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/localFun1.kt.messages diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/localFun2.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/localFun2.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/localFun2.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/localFun2.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/localFun2.kt.after b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/localFun2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/localFun2.kt.after rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/localFun2.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/localFunExt1.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/localFunExt1.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/localFunExt1.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/localFunExt1.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/localFunExt1.kt.messages b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/localFunExt1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/localFunExt1.kt.messages rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/localFunExt1.kt.messages diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/localFunExt2.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/localFunExt2.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/localFunExt2.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/localFunExt2.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/localFunExt2.kt.after b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/localFunExt2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/localFunExt2.kt.after rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/localFunExt2.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/noUsages.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/noUsages.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/noUsages.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/noUsages.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/noUsages.kt.after b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/noUsages.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/noUsages.kt.after rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/noUsages.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/override1.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/override1.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/override1.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/override1.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/override1.kt.after b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/override1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/override1.kt.after rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/override1.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/override2.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/override2.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/override2.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/override2.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/override2.kt.after b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/override2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/override2.kt.after rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/override2.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement1.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement1.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement1.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement1.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement1.kt.messages b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement1.kt.messages rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement1.kt.messages diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement2.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement2.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement2.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement2.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement2.kt.after b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement2.kt.after rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement2.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement3.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement3.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement3.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement3.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement3.kt.after b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement3.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement3.kt.after rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement3.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideWithUsages.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/overrideWithUsages.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideWithUsages.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/overrideWithUsages.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideWithUsages.kt.after b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/overrideWithUsages.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideWithUsages.kt.after rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/overrideWithUsages.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/funExt.java b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/funExt.java similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/funExt.java rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/funExt.java diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/funExt.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/funExt.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/funExt.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/funExt.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/funExt.kt.messages b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/funExt.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/funExt.kt.messages rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/funExt.kt.messages diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.java b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.java similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.java rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.java diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.kt.messages b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.kt.messages rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.kt.messages diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.java b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.java similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.java rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.java diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.java.after b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.java.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.java.after rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.java.after diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.kt.after b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.kt.after rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.java b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.java similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.java rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.java diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.kt.messages b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.kt.messages rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.kt.messages diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.java b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.java similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.java rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.java diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.java.after b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.java.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.java.after rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.java.after diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.kt.after b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.kt.after rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.java b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.java similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.java rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.java diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.java.after b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.java.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.java.after rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.java.after diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.kt.after b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.kt.after rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.java b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.java similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.java rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.java diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.java.after b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.java.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.java.after rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.java.after diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.kt.after b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.kt.after rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.java b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.java similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.java rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.java diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.java.after b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.java.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.java.after rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.java.after diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.kt.after b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.kt.after rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.java b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.java similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.java rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.java diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.kt.messages b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.kt.messages rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.kt.messages diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.java b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.java similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.java rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.java diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.java.after b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.java.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.java.after rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.java.after diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.kt.after b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.kt.after rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.kt.after diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/secondaryConstructor.java b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/secondaryConstructor.java similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/secondaryConstructor.java rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/secondaryConstructor.java diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/secondaryConstructor.kt b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/secondaryConstructor.kt similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/secondaryConstructor.kt rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/secondaryConstructor.kt diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/secondaryConstructor.kt.messages b/idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/secondaryConstructor.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/secondaryConstructor.kt.messages rename to idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/secondaryConstructor.kt.messages diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/anonymousObject.kt b/idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/anonymousObject.kt similarity index 100% rename from idea/testData/safeDelete/deleteObject/kotlinObject/anonymousObject.kt rename to idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/anonymousObject.kt diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/anonymousObject.kt.after b/idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/anonymousObject.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteObject/kotlinObject/anonymousObject.kt.after rename to idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/anonymousObject.kt.after diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/companionObject.kt b/idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/companionObject.kt similarity index 100% rename from idea/testData/safeDelete/deleteObject/kotlinObject/companionObject.kt rename to idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/companionObject.kt diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/companionObject.kt.after b/idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/companionObject.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteObject/kotlinObject/companionObject.kt.after rename to idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/companionObject.kt.after diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/localObject1.kt b/idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/localObject1.kt similarity index 100% rename from idea/testData/safeDelete/deleteObject/kotlinObject/localObject1.kt rename to idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/localObject1.kt diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/localObject1.kt.after b/idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/localObject1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteObject/kotlinObject/localObject1.kt.after rename to idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/localObject1.kt.after diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/localObject1.kt.messages b/idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/localObject1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteObject/kotlinObject/localObject1.kt.messages rename to idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/localObject1.kt.messages diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/localObject2.kt b/idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/localObject2.kt similarity index 100% rename from idea/testData/safeDelete/deleteObject/kotlinObject/localObject2.kt rename to idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/localObject2.kt diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/localObject2.kt.after b/idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/localObject2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteObject/kotlinObject/localObject2.kt.after rename to idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/localObject2.kt.after diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject1.kt b/idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/nestedObject1.kt similarity index 100% rename from idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject1.kt rename to idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/nestedObject1.kt diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject1.kt.after b/idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/nestedObject1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject1.kt.after rename to idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/nestedObject1.kt.after diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject2.kt b/idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/nestedObject2.kt similarity index 100% rename from idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject2.kt rename to idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/nestedObject2.kt diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject2.kt.messages b/idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/nestedObject2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject2.kt.messages rename to idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/nestedObject2.kt.messages diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/noUsages.kt b/idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/noUsages.kt similarity index 100% rename from idea/testData/safeDelete/deleteObject/kotlinObject/noUsages.kt rename to idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/noUsages.kt diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/noUsages.kt.after b/idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/noUsages.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteObject/kotlinObject/noUsages.kt.after rename to idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/noUsages.kt.after diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/object1.kt b/idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/object1.kt similarity index 100% rename from idea/testData/safeDelete/deleteObject/kotlinObject/object1.kt rename to idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/object1.kt diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/object1.kt.after b/idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/object1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteObject/kotlinObject/object1.kt.after rename to idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/object1.kt.after diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/object2.kt b/idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/object2.kt similarity index 100% rename from idea/testData/safeDelete/deleteObject/kotlinObject/object2.kt rename to idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/object2.kt diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/object2.kt.messages b/idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/object2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteObject/kotlinObject/object2.kt.messages rename to idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/object2.kt.messages diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/unsafeImport.kt b/idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/unsafeImport.kt similarity index 100% rename from idea/testData/safeDelete/deleteObject/kotlinObject/unsafeImport.kt rename to idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/unsafeImport.kt diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/unsafeImport.kt.messages b/idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/unsafeImport.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteObject/kotlinObject/unsafeImport.kt.messages rename to idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/unsafeImport.kt.messages diff --git a/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.java b/idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.java similarity index 100% rename from idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.java rename to idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.java diff --git a/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.java.after b/idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.java.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.java.after rename to idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.java.after diff --git a/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.kt b/idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.kt diff --git a/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.java b/idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.java similarity index 100% rename from idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.java rename to idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.java diff --git a/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.kt b/idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.kt diff --git a/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.kt.messages b/idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.kt.messages rename to idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.kt.messages diff --git a/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.java b/idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.java similarity index 100% rename from idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.java rename to idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.java diff --git a/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.java.after b/idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.java.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.java.after rename to idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.java.after diff --git a/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.kt b/idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.kt diff --git a/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.java b/idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.java similarity index 100% rename from idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.java rename to idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.java diff --git a/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.kt b/idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.kt diff --git a/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.kt.messages b/idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.kt.messages rename to idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.kt.messages diff --git a/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.java b/idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.java similarity index 100% rename from idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.java rename to idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.java diff --git a/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.java.after b/idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.java.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.java.after rename to idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.java.after diff --git a/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.kt b/idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.kt diff --git a/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.java b/idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.java similarity index 100% rename from idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.java rename to idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.java diff --git a/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.kt b/idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.kt diff --git a/idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.kt.messages b/idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.kt.messages rename to idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.kt.messages diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement1.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement1.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/implement1.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement1.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement1.kt.messages b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/implement1.kt.messages rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement1.kt.messages diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement2.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement2.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/implement2.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement2.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement2.kt.messages b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/implement2.kt.messages rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement2.kt.messages diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement3.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement3.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/implement3.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement3.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement3.kt.messages b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement3.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/implement3.kt.messages rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement3.kt.messages diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement4.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement4.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/implement4.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement4.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement4.kt.messages b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement4.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/implement4.kt.messages rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement4.kt.messages diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement5.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement5.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/implement5.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement5.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement5.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement5.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/implement5.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement5.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement6.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement6.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/implement6.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement6.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement6.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement6.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/implement6.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement6.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement7.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement7.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/implement7.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement7.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement7.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement7.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/implement7.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement7.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement8.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement8.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/implement8.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement8.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/implement8.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement8.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/implement8.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement8.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/noUsages.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/noUsages.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/noUsages.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/noUsages.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/noUsages.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/noUsages.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/noUsages.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/noUsages.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/override1.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/override1.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/override1.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/override1.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/override1.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/override1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/override1.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/override1.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/override2.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/override2.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/override2.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/override2.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/override2.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/override2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/override2.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/override2.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/override3.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/override3.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/override3.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/override3.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/override3.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/override3.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/override3.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/override3.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/override4.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/override4.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/override4.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/override4.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/override4.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/override4.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/override4.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/override4.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement1.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement1.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement1.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement1.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement1.kt.messages b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement1.kt.messages rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement1.kt.messages diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement2.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement2.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement2.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement2.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement2.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement2.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement2.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement3.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement3.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement3.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement3.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement3.kt.messages b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement3.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement3.kt.messages rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement3.kt.messages diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement4.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement4.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement4.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement4.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement4.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement4.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement4.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement4.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideWithUsages.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideWithUsages.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideWithUsages.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideWithUsages.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideWithUsages.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideWithUsages.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideWithUsages.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideWithUsages.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/property1.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/property1.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/property1.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/property1.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/property1.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/property1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/property1.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/property1.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/property2.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/property2.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/property2.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/property2.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/property2.kt.messages b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/property2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/property2.kt.messages rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/property2.kt.messages diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyExt1.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/propertyExt1.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyExt1.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/propertyExt1.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyExt1.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/propertyExt1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyExt1.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/propertyExt1.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyExt2.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/propertyExt2.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyExt2.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/propertyExt2.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyExt2.kt.messages b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/propertyExt2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyExt2.kt.messages rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/propertyExt2.kt.messages diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyInLocalObject.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/propertyInLocalObject.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyInLocalObject.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/propertyInLocalObject.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyInLocalObject.kt.messages b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/propertyInLocalObject.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyInLocalObject.kt.messages rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/propertyInLocalObject.kt.messages diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.java b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.java similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.java rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.java diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.java.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.java.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.java.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.java.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.java b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.java similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.java rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.java diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.java.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.java.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.java.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.java.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.java b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.java similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.java rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.java diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.java.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.java.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.java.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.java.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.java b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.java similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.java rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.java diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.java.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.java.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.java.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.java.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.java b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.java similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.java rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.java diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.java.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.java.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.java.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.java.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.java b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.java similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.java rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.java diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.java.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.java.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.java.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.java.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.java b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.java similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.java rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.java diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.java.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.java.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.java.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.java.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.java b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.java similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.java rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.java diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.java.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.java.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.java.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.java.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.java b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.java similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.java rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.java diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.java.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.java.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.java.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.java.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.java b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.java similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.java rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.java diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.java.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.java.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.java.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.java.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.kt.after b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.kt.after rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.kt.after diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/propertyExt.java b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/propertyExt.java similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/propertyExt.java rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/propertyExt.java diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/propertyExt.kt b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/propertyExt.kt similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/propertyExt.kt rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/propertyExt.kt diff --git a/idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/propertyExt.kt.messages b/idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/propertyExt.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/propertyExt.kt.messages rename to idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/propertyExt.kt.messages diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages1.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages1.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages1.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages1.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages1.kt.messages b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages1.kt.messages rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages1.kt.messages diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages2.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages2.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages2.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages2.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages2.kt.messages b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages2.kt.messages rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages2.kt.messages diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages3.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages3.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages3.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages3.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages3.kt.messages b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages3.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages3.kt.messages rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages3.kt.messages diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages4.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages4.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages4.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages4.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages4.kt.messages b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages4.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages4.kt.messages rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages4.kt.messages diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt.messages b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt.messages rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt.messages diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint1.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint1.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint1.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint1.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint1.kt.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint1.kt.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint1.kt.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint2.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint2.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint2.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint2.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint2.kt.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint2.kt.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint2.kt.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass1.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass1.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass1.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass1.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass1.kt.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass1.kt.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass1.kt.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass2.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass2.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass2.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass2.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass2.kt.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass2.kt.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass2.kt.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst1.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst1.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst1.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst1.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst1.kt.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst1.kt.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst1.kt.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst2.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst2.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst2.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst2.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst2.kt.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst2.kt.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst2.kt.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst3.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst3.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst3.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst3.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst3.kt.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst3.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst3.kt.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst3.kt.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst6.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst6.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst6.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst6.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst6.kt.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst6.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst6.kt.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst6.kt.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst7.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst7.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst7.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst7.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst7.kt.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst7.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst7.kt.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst7.kt.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.java b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.java similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.java rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.java diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.kt.messages b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.kt.messages rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.kt.messages diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.java b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.java similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.java rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.java diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.kt.messages b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.kt.messages rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.kt.messages diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.java b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.java similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.java rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.java diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.kt.messages b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.kt.messages rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.kt.messages diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.java b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.java similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.java rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.java diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.kt.messages b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.kt.messages rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.kt.messages diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.java b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.java similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.java rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.java diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt.messages b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt.messages rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt.messages diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.java b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.java similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.java rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.java diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.java.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.java.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.java.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.java.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.kt.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.kt.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.kt.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.java b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.java similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.java rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.java diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.java.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.java.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.java.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.java.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.kt.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.kt.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.kt.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.java b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.java similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.java rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.java diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.java.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.java.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.java.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.java.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.kt.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.kt.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.kt.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.java b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.java similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.java rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.java diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.java.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.java.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.java.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.java.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.kt.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.kt.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.kt.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.java b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.java similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.java rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.java diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.java.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.java.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.java.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.java.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.kt.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.kt.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.kt.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.java b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.java similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.java rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.java diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.java.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.java.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.java.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.java.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.kt.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.kt.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.kt.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.java b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.java similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.java rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.java diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.java.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.java.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.java.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.java.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.kt.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.kt.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.kt.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.java b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.java similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.java rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.java diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.java.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.java.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.java.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.java.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.kt.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.kt.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.kt.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.java b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.java similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.java rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.java diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.java.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.java.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.java.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.java.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.java b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.java similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.java rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.java diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.java.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.java.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.java.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.java.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.java b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.java similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.java rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.java diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.java.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.java.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.java.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.java.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.kt.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.kt.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.kt.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.java b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.java similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.java rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.java diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.java.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.java.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.java.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.java.after diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.kt b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.kt similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.kt rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.kt diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.kt.after b/idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.kt.after rename to idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/dataClassComponent.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/dataClassComponent.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/dataClassComponent.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/dataClassComponent.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/dataClassComponent.kt.messages b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/dataClassComponent.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/dataClassComponent.kt.messages rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/dataClassComponent.kt.messages diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam1.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam1.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam1.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam1.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam1.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam1.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam1.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam2.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam2.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam2.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam2.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam2.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam2.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam2.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam1.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam1.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam1.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam1.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam1.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam1.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam1.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam2.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam2.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam2.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam2.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam2.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam2.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam2.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages1.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages1.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages1.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages1.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages1.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages1.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages1.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages2.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages2.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages2.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages2.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages2.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages2.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages2.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages3.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages3.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages3.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages3.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages3.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages3.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages3.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages3.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages4.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages4.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages4.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages4.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages4.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages4.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages4.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages4.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages5.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages5.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages5.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages5.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages5.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages5.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages5.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages5.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages1.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages1.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages1.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages1.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages1.kt.messages b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages1.kt.messages rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages1.kt.messages diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages2.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages2.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages2.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages2.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages2.kt.messages b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages2.kt.messages rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages2.kt.messages diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages3.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages3.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages3.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages3.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages3.kt.messages b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages3.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages3.kt.messages rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages3.kt.messages diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages4.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages4.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages4.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages4.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages4.kt.messages b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages4.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages4.kt.messages rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages4.kt.messages diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages5.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages5.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages5.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages5.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages5.kt.messages b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages5.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages5.kt.messages rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages5.kt.messages diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages6.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages6.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages6.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages6.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages6.kt.messages b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages6.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages6.kt.messages rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages6.kt.messages diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages7.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages7.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages7.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages7.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages7.kt.messages b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages7.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages7.kt.messages rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages7.kt.messages diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages8.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages8.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages8.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages8.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages8.kt.messages b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages8.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages8.kt.messages rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages8.kt.messages diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage1.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage1.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage1.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage1.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage1.kt.messages b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage1.kt.messages rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage1.kt.messages diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage2.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage2.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage2.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage2.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage2.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage2.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage2.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArg.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArg.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArg.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArg.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArg.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArg.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArg.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArg.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArgExt.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArgExt.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArgExt.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArgExt.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArgExt.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArgExt.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArgExt.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArgExt.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam1.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam1.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam1.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam1.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam1.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam1.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam1.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam2.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam2.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam2.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam2.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam2.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam2.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam2.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam1.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam1.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam1.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam1.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam1.kt.messages b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam1.kt.messages rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam1.kt.messages diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam2.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam2.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam2.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam2.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam2.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam2.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam2.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages1.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages1.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages1.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages1.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages1.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages1.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages1.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages2.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages2.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages2.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages2.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages2.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages2.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages2.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages3.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages3.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages3.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages3.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages3.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages3.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages3.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages3.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt1.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt1.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt1.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt1.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt1.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt1.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt1.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt2.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt2.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt2.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt2.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt2.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt2.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt2.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/setter.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/setter.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/setter.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/setter.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/setter.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/setter.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/setter.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/setter.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/dataClassComponent.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/dataClassComponent.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/dataClassComponent.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/dataClassComponent.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/dataClassComponent.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/dataClassComponent.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/dataClassComponent.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/dataClassComponent.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/dataClassComponent.kt.messages b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/dataClassComponent.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/dataClassComponent.kt.messages rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/dataClassComponent.kt.messages diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages1.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages1.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages1.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages1.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages1.java.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages1.java.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages1.java.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages1.java.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages1.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages1.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages1.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages1.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages1.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages1.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages1.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages2.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages2.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages2.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages2.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages2.java.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages2.java.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages2.java.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages2.java.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages2.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages2.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages2.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages2.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages2.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages2.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages2.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages3.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages3.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages3.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages3.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages3.java.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages3.java.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages3.java.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages3.java.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages3.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages3.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages3.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages3.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages3.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages3.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages3.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages3.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages4.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages4.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages4.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages4.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages4.java.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages4.java.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages4.java.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages4.java.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages4.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages4.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages4.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages4.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages4.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages4.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages4.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages4.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages5.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages5.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages5.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages5.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages5.java.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages5.java.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages5.java.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages5.java.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages5.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages5.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages5.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages5.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages5.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages5.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages5.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages5.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages1.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages1.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages1.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages1.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages1.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages1.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages1.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages1.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages1.kt.messages b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages1.kt.messages rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages1.kt.messages diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages2.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages2.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages2.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages2.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages2.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages2.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages2.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages2.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages2.kt.messages b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages2.kt.messages rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages2.kt.messages diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages3.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages3.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages3.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages3.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages3.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages3.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages3.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages3.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages3.kt.messages b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages3.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages3.kt.messages rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages3.kt.messages diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages4.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages4.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages4.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages4.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages4.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages4.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages4.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages4.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages4.kt.messages b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages4.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages4.kt.messages rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages4.kt.messages diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages5.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages5.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages5.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages5.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages5.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages5.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages5.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages5.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages5.kt.messages b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages5.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages5.kt.messages rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages5.kt.messages diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage1.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage1.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage1.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage1.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage1.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage1.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage1.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage1.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage1.kt.messages b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage1.kt.messages rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage1.kt.messages diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.java.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.java.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.java.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.java.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.java.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.java.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.java.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.java.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.java.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.java.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.java.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.java.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.java.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.java.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.java.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.java.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy2.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy2.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy2.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy2.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy2.java.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy2.java.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy2.java.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy2.java.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy2.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy2.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy2.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy2.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy2.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy2.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy2.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy3.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy3.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy3.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy3.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy3.java.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy3.java.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy3.java.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy3.java.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy3.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy3.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy3.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy3.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy3.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy3.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy3.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy3.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages1.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages1.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages1.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages1.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages1.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages1.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages1.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages1.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages1.kt.messages b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages1.kt.messages rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages1.kt.messages diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages2.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages2.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages2.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages2.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages2.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages2.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages2.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages2.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages2.kt.messages b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages2.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages2.kt.messages rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages2.kt.messages diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.kt.messages b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.kt.messages rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.kt.messages diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.kt.messages b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.kt.messages similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.kt.messages rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.kt.messages diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.java.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.java.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.java.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.java.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.java.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.java.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.java.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.java.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages2.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages2.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages2.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages2.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages2.java.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages2.java.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages2.java.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages2.java.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages2.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages2.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages2.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages2.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages2.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages2.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages2.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages3.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages3.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages3.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages3.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages3.java.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages3.java.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages3.java.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages3.java.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages3.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages3.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages3.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages3.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages3.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages3.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages3.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages3.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt1.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt1.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt1.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt1.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt1.java.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt1.java.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt1.java.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt1.java.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt1.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt1.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt1.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt1.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt1.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt1.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt1.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt1.kt.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt2.java b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt2.java similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt2.java rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt2.java diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt2.java.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt2.java.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt2.java.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt2.java.after diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt2.kt b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt2.kt similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt2.kt rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt2.kt diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt2.kt.after b/idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt2.kt.after similarity index 100% rename from idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt2.kt.after rename to idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt2.kt.after diff --git a/idea/tests/org/jetbrains/kotlin/safeDelete/AbstractSafeDeleteTest.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/safeDelete/AbstractSafeDeleteTest.java similarity index 98% rename from idea/tests/org/jetbrains/kotlin/safeDelete/AbstractSafeDeleteTest.java rename to idea/tests/org/jetbrains/kotlin/idea/refactoring/safeDelete/AbstractSafeDeleteTest.java index 9a53fc79151..9d94e1c25a6 100644 --- a/idea/tests/org/jetbrains/kotlin/safeDelete/AbstractSafeDeleteTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/safeDelete/AbstractSafeDeleteTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.safeDelete; +package org.jetbrains.kotlin.idea.refactoring.safeDelete; import com.intellij.codeInsight.TargetElementUtilBase; import com.intellij.openapi.editor.Editor; diff --git a/idea/tests/org/jetbrains/kotlin/safeDelete/SafeDeleteTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/safeDelete/SafeDeleteTestGenerated.java similarity index 68% rename from idea/tests/org/jetbrains/kotlin/safeDelete/SafeDeleteTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/refactoring/safeDelete/SafeDeleteTestGenerated.java index 0399fd49032..46224c632b8 100644 --- a/idea/tests/org/jetbrains/kotlin/safeDelete/SafeDeleteTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/safeDelete/SafeDeleteTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.safeDelete; +package org.jetbrains.kotlin.idea.refactoring.safeDelete; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; @@ -29,1241 +29,1241 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @RunWith(JUnit3RunnerWithInners.class) public class SafeDeleteTestGenerated extends AbstractSafeDeleteTest { - @TestMetadata("idea/testData/safeDelete/deleteClass/kotlinClass") + @TestMetadata("idea/testData/refactoring/safeDelete/deleteClass/kotlinClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class KotlinClass extends AbstractSafeDeleteTest { public void testAllFilesPresentInKotlinClass() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteClass/kotlinClass"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/safeDelete/deleteClass/kotlinClass"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("class1.kt") public void testClass1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/class1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/class1.kt"); doClassTest(fileName); } @TestMetadata("class2.kt") public void testClass2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/class2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/class2.kt"); doClassTest(fileName); } @TestMetadata("classInString.kt") public void testClassInString() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/classInString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/classInString.kt"); doClassTest(fileName); } @TestMetadata("classWithExternalConstructructorUsage.kt") public void testClassWithExternalConstructructorUsage() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/classWithExternalConstructructorUsage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/classWithExternalConstructructorUsage.kt"); doClassTest(fileName); } @TestMetadata("classWithInternalConstructructorUsage.kt") public void testClassWithInternalConstructructorUsage() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/classWithInternalConstructructorUsage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/classWithInternalConstructructorUsage.kt"); doClassTest(fileName); } @TestMetadata("localClass1.kt") public void testLocalClass1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/localClass1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/localClass1.kt"); doClassTest(fileName); } @TestMetadata("localClass2.kt") public void testLocalClass2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/localClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/localClass2.kt"); doClassTest(fileName); } @TestMetadata("nestedClass1.kt") public void testNestedClass1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/nestedClass1.kt"); doClassTest(fileName); } @TestMetadata("nestedClass2.kt") public void testNestedClass2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/nestedClass2.kt"); doClassTest(fileName); } @TestMetadata("noUsages.kt") public void testNoUsages() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/noUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/noUsages.kt"); doClassTest(fileName); } @TestMetadata("trait1.kt") public void testTrait1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/trait1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/trait1.kt"); doClassTest(fileName); } @TestMetadata("trait2.kt") public void testTrait2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/trait2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/trait2.kt"); doClassTest(fileName); } @TestMetadata("unsafeImport.kt") public void testUnsafeImport() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/unsafeImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteClass/kotlinClass/unsafeImport.kt"); doClassTest(fileName); } } - @TestMetadata("idea/testData/safeDelete/deleteClass/kotlinClassWithJava") + @TestMetadata("idea/testData/refactoring/safeDelete/deleteClass/kotlinClassWithJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class KotlinClassWithJava extends AbstractSafeDeleteTest { public void testAllFilesPresentInKotlinClassWithJava() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteClass/kotlinClassWithJava"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/safeDelete/deleteClass/kotlinClassWithJava"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classWithDelegationCalls.kt") public void testClassWithDelegationCalls() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClassWithJava/classWithDelegationCalls.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteClass/kotlinClassWithJava/classWithDelegationCalls.kt"); doClassTestWithJava(fileName); } } - @TestMetadata("idea/testData/safeDelete/deleteObject/kotlinObject") + @TestMetadata("idea/testData/refactoring/safeDelete/deleteObject/kotlinObject") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class KotlinObject extends AbstractSafeDeleteTest { public void testAllFilesPresentInKotlinObject() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteObject/kotlinObject"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/safeDelete/deleteObject/kotlinObject"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("anonymousObject.kt") public void testAnonymousObject() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/anonymousObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/anonymousObject.kt"); doObjectTest(fileName); } @TestMetadata("companionObject.kt") public void testCompanionObject() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/companionObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/companionObject.kt"); doObjectTest(fileName); } @TestMetadata("localObject1.kt") public void testLocalObject1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/localObject1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/localObject1.kt"); doObjectTest(fileName); } @TestMetadata("localObject2.kt") public void testLocalObject2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/localObject2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/localObject2.kt"); doObjectTest(fileName); } @TestMetadata("nestedObject1.kt") public void testNestedObject1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/nestedObject1.kt"); doObjectTest(fileName); } @TestMetadata("nestedObject2.kt") public void testNestedObject2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/nestedObject2.kt"); doObjectTest(fileName); } @TestMetadata("noUsages.kt") public void testNoUsages() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/noUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/noUsages.kt"); doObjectTest(fileName); } @TestMetadata("object1.kt") public void testObject1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/object1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/object1.kt"); doObjectTest(fileName); } @TestMetadata("object2.kt") public void testObject2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/object2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/object2.kt"); doObjectTest(fileName); } @TestMetadata("unsafeImport.kt") public void testUnsafeImport() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/unsafeImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteObject/kotlinObject/unsafeImport.kt"); doObjectTest(fileName); } } - @TestMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction") + @TestMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class KotlinFunction extends AbstractSafeDeleteTest { public void testAllFilesPresentInKotlinFunction() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteFunction/kotlinFunction"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("fun1.kt") public void testFun1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/fun1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/fun1.kt"); doFunctionTest(fileName); } @TestMetadata("fun2.kt") public void testFun2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/fun2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/fun2.kt"); doFunctionTest(fileName); } @TestMetadata("funExt1.kt") public void testFunExt1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/funExt1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/funExt1.kt"); doFunctionTest(fileName); } @TestMetadata("funExt2.kt") public void testFunExt2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/funExt2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/funExt2.kt"); doFunctionTest(fileName); } @TestMetadata("implement1.kt") public void testImplement1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/implement1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/implement1.kt"); doFunctionTest(fileName); } @TestMetadata("implement2.kt") public void testImplement2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/implement2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/implement2.kt"); doFunctionTest(fileName); } @TestMetadata("localFun1.kt") public void testLocalFun1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/localFun1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/localFun1.kt"); doFunctionTest(fileName); } @TestMetadata("localFun2.kt") public void testLocalFun2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/localFun2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/localFun2.kt"); doFunctionTest(fileName); } @TestMetadata("localFunExt1.kt") public void testLocalFunExt1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/localFunExt1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/localFunExt1.kt"); doFunctionTest(fileName); } @TestMetadata("localFunExt2.kt") public void testLocalFunExt2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/localFunExt2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/localFunExt2.kt"); doFunctionTest(fileName); } @TestMetadata("noUsages.kt") public void testNoUsages() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/noUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/noUsages.kt"); doFunctionTest(fileName); } @TestMetadata("override1.kt") public void testOverride1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/override1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/override1.kt"); doFunctionTest(fileName); } @TestMetadata("override2.kt") public void testOverride2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/override2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/override2.kt"); doFunctionTest(fileName); } @TestMetadata("overrideAndImplement1.kt") public void testOverrideAndImplement1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement1.kt"); doFunctionTest(fileName); } @TestMetadata("overrideAndImplement2.kt") public void testOverrideAndImplement2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement2.kt"); doFunctionTest(fileName); } @TestMetadata("overrideAndImplement3.kt") public void testOverrideAndImplement3() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement3.kt"); doFunctionTest(fileName); } @TestMetadata("overrideWithUsages.kt") public void testOverrideWithUsages() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideWithUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunction/overrideWithUsages.kt"); doFunctionTest(fileName); } } - @TestMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava") + @TestMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class KotlinFunctionWithJava extends AbstractSafeDeleteTest { public void testAllFilesPresentInKotlinFunctionWithJava() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("funExt.kt") public void testFunExt() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/funExt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/funExt.kt"); doFunctionTestWithJava(fileName); } @TestMetadata("implement1.kt") public void testImplement1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.kt"); doFunctionTestWithJava(fileName); } @TestMetadata("implement2.kt") public void testImplement2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.kt"); doFunctionTestWithJava(fileName); } @TestMetadata("implement3.kt") public void testImplement3() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.kt"); doFunctionTestWithJava(fileName); } @TestMetadata("implement4.kt") public void testImplement4() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.kt"); doFunctionTestWithJava(fileName); } @TestMetadata("override1.kt") public void testOverride1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.kt"); doFunctionTestWithJava(fileName); } @TestMetadata("override2.kt") public void testOverride2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.kt"); doFunctionTestWithJava(fileName); } @TestMetadata("override3.kt") public void testOverride3() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.kt"); doFunctionTestWithJava(fileName); } @TestMetadata("overrideAndImplement1.kt") public void testOverrideAndImplement1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.kt"); doFunctionTestWithJava(fileName); } @TestMetadata("overrideAndImplement2.kt") public void testOverrideAndImplement2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.kt"); doFunctionTestWithJava(fileName); } @TestMetadata("secondaryConstructor.kt") public void testSecondaryConstructor() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/secondaryConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/kotlinFunctionWithJava/secondaryConstructor.kt"); doFunctionTestWithJava(fileName); } } - @TestMetadata("idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin") + @TestMetadata("idea/testData/refactoring/safeDelete/deleteFunction/javaFunctionWithKotlin") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class JavaFunctionWithKotlin extends AbstractSafeDeleteTest { public void testAllFilesPresentInJavaFunctionWithKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/safeDelete/deleteFunction/javaFunctionWithKotlin"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("mixedHierarchy1.kt") public void testMixedHierarchy1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.kt"); doJavaMethodTest(fileName); } @TestMetadata("mixedHierarchy2.kt") public void testMixedHierarchy2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.kt"); doJavaMethodTest(fileName); } } - @TestMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty") + @TestMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class KotlinProperty extends AbstractSafeDeleteTest { public void testAllFilesPresentInKotlinProperty() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteProperty/kotlinProperty"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("implement1.kt") public void testImplement1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement1.kt"); doPropertyTest(fileName); } @TestMetadata("implement2.kt") public void testImplement2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement2.kt"); doPropertyTest(fileName); } @TestMetadata("implement3.kt") public void testImplement3() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement3.kt"); doPropertyTest(fileName); } @TestMetadata("implement4.kt") public void testImplement4() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement4.kt"); doPropertyTest(fileName); } @TestMetadata("implement5.kt") public void testImplement5() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement5.kt"); doPropertyTest(fileName); } @TestMetadata("implement6.kt") public void testImplement6() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement6.kt"); doPropertyTest(fileName); } @TestMetadata("implement7.kt") public void testImplement7() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement7.kt"); doPropertyTest(fileName); } @TestMetadata("implement8.kt") public void testImplement8() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement8.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/implement8.kt"); doPropertyTest(fileName); } @TestMetadata("noUsages.kt") public void testNoUsages() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/noUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/noUsages.kt"); doPropertyTest(fileName); } @TestMetadata("override1.kt") public void testOverride1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/override1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/override1.kt"); doPropertyTest(fileName); } @TestMetadata("override2.kt") public void testOverride2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/override2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/override2.kt"); doPropertyTest(fileName); } @TestMetadata("override3.kt") public void testOverride3() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/override3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/override3.kt"); doPropertyTest(fileName); } @TestMetadata("override4.kt") public void testOverride4() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/override4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/override4.kt"); doPropertyTest(fileName); } @TestMetadata("overrideAndImplement1.kt") public void testOverrideAndImplement1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement1.kt"); doPropertyTest(fileName); } @TestMetadata("overrideAndImplement2.kt") public void testOverrideAndImplement2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement2.kt"); doPropertyTest(fileName); } @TestMetadata("overrideAndImplement3.kt") public void testOverrideAndImplement3() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement3.kt"); doPropertyTest(fileName); } @TestMetadata("overrideAndImplement4.kt") public void testOverrideAndImplement4() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement4.kt"); doPropertyTest(fileName); } @TestMetadata("overrideWithUsages.kt") public void testOverrideWithUsages() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideWithUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/overrideWithUsages.kt"); doPropertyTest(fileName); } @TestMetadata("property1.kt") public void testProperty1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/property1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/property1.kt"); doPropertyTest(fileName); } @TestMetadata("property2.kt") public void testProperty2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/property2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/property2.kt"); doPropertyTest(fileName); } @TestMetadata("propertyExt1.kt") public void testPropertyExt1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyExt1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/propertyExt1.kt"); doPropertyTest(fileName); } @TestMetadata("propertyExt2.kt") public void testPropertyExt2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyExt2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/propertyExt2.kt"); doPropertyTest(fileName); } @TestMetadata("propertyInLocalObject.kt") public void testPropertyInLocalObject() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyInLocalObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinProperty/propertyInLocalObject.kt"); doPropertyTest(fileName); } } - @TestMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava") + @TestMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class KotlinPropertyWithJava extends AbstractSafeDeleteTest { public void testAllFilesPresentInKotlinPropertyWithJava() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("implement1.kt") public void testImplement1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.kt"); doPropertyTestWithJava(fileName); } @TestMetadata("implement2.kt") public void testImplement2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.kt"); doPropertyTestWithJava(fileName); } @TestMetadata("implement3.kt") public void testImplement3() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.kt"); doPropertyTestWithJava(fileName); } @TestMetadata("implement4.kt") public void testImplement4() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.kt"); doPropertyTestWithJava(fileName); } @TestMetadata("override1.kt") public void testOverride1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.kt"); doPropertyTestWithJava(fileName); } @TestMetadata("override2.kt") public void testOverride2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.kt"); doPropertyTestWithJava(fileName); } @TestMetadata("override3.kt") public void testOverride3() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.kt"); doPropertyTestWithJava(fileName); } @TestMetadata("override4.kt") public void testOverride4() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.kt"); doPropertyTestWithJava(fileName); } @TestMetadata("overrideAndImplement1.kt") public void testOverrideAndImplement1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.kt"); doPropertyTestWithJava(fileName); } @TestMetadata("overrideAndImplement2.kt") public void testOverrideAndImplement2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.kt"); doPropertyTestWithJava(fileName); } @TestMetadata("propertyExt.kt") public void testPropertyExt() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/propertyExt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/kotlinPropertyWithJava/propertyExt.kt"); doPropertyTestWithJava(fileName); } } - @TestMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin") + @TestMetadata("idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class JavaPropertyWithKotlin extends AbstractSafeDeleteTest { public void testAllFilesPresentInJavaPropertyWithKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("middleJava1.kt") public void testMiddleJava1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.kt"); doJavaPropertyTest(fileName); } @TestMetadata("middleJava2.kt") public void testMiddleJava2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.kt"); doJavaPropertyTest(fileName); } @TestMetadata("middleJava3.kt") public void testMiddleJava3() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.kt"); doJavaPropertyTest(fileName); } @TestMetadata("middleJava4.kt") public void testMiddleJava4() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.kt"); doJavaPropertyTest(fileName); } @TestMetadata("middleJava5.kt") public void testMiddleJava5() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.kt"); doJavaPropertyTest(fileName); } @TestMetadata("middleJava6.kt") public void testMiddleJava6() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.kt"); doJavaPropertyTest(fileName); } } - @TestMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter") + @TestMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class KotlinTypeParameter extends AbstractSafeDeleteTest { public void testAllFilesPresentInKotlinTypeParameter() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("internalUsages1.kt") public void testInternalUsages1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages1.kt"); doTypeParameterTest(fileName); } @TestMetadata("internalUsages2.kt") public void testInternalUsages2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages2.kt"); doTypeParameterTest(fileName); } @TestMetadata("internalUsages3.kt") public void testInternalUsages3() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages3.kt"); doTypeParameterTest(fileName); } @TestMetadata("internalUsages4.kt") public void testInternalUsages4() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages4.kt"); doTypeParameterTest(fileName); } @TestMetadata("internalUsages5.kt") public void testInternalUsages5() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt"); doTypeParameterTest(fileName); } @TestMetadata("safeUsagesWithConstraint1.kt") public void testSafeUsagesWithConstraint1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint1.kt"); doTypeParameterTest(fileName); } @TestMetadata("safeUsagesWithConstraint2.kt") public void testSafeUsagesWithConstraint2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint2.kt"); doTypeParameterTest(fileName); } @TestMetadata("subclass1.kt") public void testSubclass1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass1.kt"); doTypeParameterTest(fileName); } @TestMetadata("subclass2.kt") public void testSubclass2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass2.kt"); doTypeParameterTest(fileName); } @TestMetadata("subst1.kt") public void testSubst1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst1.kt"); doTypeParameterTest(fileName); } @TestMetadata("subst2.kt") public void testSubst2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst2.kt"); doTypeParameterTest(fileName); } @TestMetadata("subst3.kt") public void testSubst3() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst3.kt"); doTypeParameterTest(fileName); } @TestMetadata("subst4.kt") public void testSubst4() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt"); doTypeParameterTest(fileName); } @TestMetadata("subst5.kt") public void testSubst5() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt"); doTypeParameterTest(fileName); } @TestMetadata("subst6.kt") public void testSubst6() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst6.kt"); doTypeParameterTest(fileName); } @TestMetadata("subst7.kt") public void testSubst7() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst7.kt"); doTypeParameterTest(fileName); } } - @TestMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava") + @TestMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class KotlinTypeParameterWithJava extends AbstractSafeDeleteTest { public void testAllFilesPresentInKotlinTypeParameterWithJava() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("internalUsages1.kt") public void testInternalUsages1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("internalUsages2.kt") public void testInternalUsages2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("internalUsages3.kt") public void testInternalUsages3() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("internalUsages4.kt") public void testInternalUsages4() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("internalUsages5.kt") public void testInternalUsages5() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("rawType.kt") public void testRawType() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("safeUsagesWithConstraint1.kt") public void testSafeUsagesWithConstraint1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("safeUsagesWithConstraint2.kt") public void testSafeUsagesWithConstraint2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("subclass1.kt") public void testSubclass1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("subclass2.kt") public void testSubclass2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("subst1.kt") public void testSubst1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("subst2.kt") public void testSubst2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("subst3.kt") public void testSubst3() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("subst4.kt") public void testSubst4() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("subst5.kt") public void testSubst5() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("subst6.kt") public void testSubst6() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("subst7.kt") public void testSubst7() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.kt"); doTypeParameterTestWithJava(fileName); } } - @TestMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter") + @TestMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class KotlinValueParameter extends AbstractSafeDeleteTest { public void testAllFilesPresentInKotlinValueParameter() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("dataClassComponent.kt") public void testDataClassComponent() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/dataClassComponent.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/dataClassComponent.kt"); doValueParameterTest(fileName); } @TestMetadata("defaultParam1.kt") public void testDefaultParam1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam1.kt"); doValueParameterTest(fileName); } @TestMetadata("defaultParam2.kt") public void testDefaultParam2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam2.kt"); doValueParameterTest(fileName); } @TestMetadata("extNamedParam1.kt") public void testExtNamedParam1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam1.kt"); doValueParameterTest(fileName); } @TestMetadata("extNamedParam2.kt") public void testExtNamedParam2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam2.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithSafeUsages1.kt") public void testHierarchyWithSafeUsages1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages1.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithSafeUsages2.kt") public void testHierarchyWithSafeUsages2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages2.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithSafeUsages3.kt") public void testHierarchyWithSafeUsages3() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages3.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithSafeUsages4.kt") public void testHierarchyWithSafeUsages4() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages4.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithSafeUsages5.kt") public void testHierarchyWithSafeUsages5() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages5.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithUnsafeUsages1.kt") public void testHierarchyWithUnsafeUsages1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages1.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithUnsafeUsages2.kt") public void testHierarchyWithUnsafeUsages2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages2.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithUnsafeUsages3.kt") public void testHierarchyWithUnsafeUsages3() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages3.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithUnsafeUsages4.kt") public void testHierarchyWithUnsafeUsages4() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages4.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithUnsafeUsages5.kt") public void testHierarchyWithUnsafeUsages5() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages5.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithUnsafeUsages6.kt") public void testHierarchyWithUnsafeUsages6() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages6.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithUnsafeUsages7.kt") public void testHierarchyWithUnsafeUsages7() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages7.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithUnsafeUsages8.kt") public void testHierarchyWithUnsafeUsages8() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages8.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages8.kt"); doValueParameterTest(fileName); } @TestMetadata("internalUsage1.kt") public void testInternalUsage1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage1.kt"); doValueParameterTest(fileName); } @TestMetadata("internalUsage2.kt") public void testInternalUsage2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage2.kt"); doValueParameterTest(fileName); } @TestMetadata("lambdaArg.kt") public void testLambdaArg() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArg.kt"); doValueParameterTest(fileName); } @TestMetadata("lambdaArgExt.kt") public void testLambdaArgExt() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArgExt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArgExt.kt"); doValueParameterTest(fileName); } @TestMetadata("namedParam1.kt") public void testNamedParam1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam1.kt"); doValueParameterTest(fileName); } @TestMetadata("namedParam2.kt") public void testNamedParam2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam2.kt"); doValueParameterTest(fileName); } @TestMetadata("propertyParam1.kt") public void testPropertyParam1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam1.kt"); doValueParameterTest(fileName); } @TestMetadata("propertyParam2.kt") public void testPropertyParam2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam2.kt"); doValueParameterTest(fileName); } @TestMetadata("safeUsages1.kt") public void testSafeUsages1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages1.kt"); doValueParameterTest(fileName); } @TestMetadata("safeUsages2.kt") public void testSafeUsages2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages2.kt"); doValueParameterTest(fileName); } @TestMetadata("safeUsages3.kt") public void testSafeUsages3() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages3.kt"); doValueParameterTest(fileName); } @TestMetadata("safeUsagesExt1.kt") public void testSafeUsagesExt1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt1.kt"); doValueParameterTest(fileName); } @TestMetadata("safeUsagesExt2.kt") public void testSafeUsagesExt2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt2.kt"); doValueParameterTest(fileName); } @TestMetadata("setter.kt") public void testSetter() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/setter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameter/setter.kt"); doValueParameterTest(fileName); } } - @TestMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava") + @TestMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class KotlinValueParameterWithJava extends AbstractSafeDeleteTest { public void testAllFilesPresentInKotlinValueParameterWithJava() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("dataClassComponent.kt") public void testDataClassComponent() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/dataClassComponent.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/dataClassComponent.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("hierarchyWithSafeUsages1.kt") public void testHierarchyWithSafeUsages1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages1.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("hierarchyWithSafeUsages2.kt") public void testHierarchyWithSafeUsages2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages2.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("hierarchyWithSafeUsages3.kt") public void testHierarchyWithSafeUsages3() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages3.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("hierarchyWithSafeUsages4.kt") public void testHierarchyWithSafeUsages4() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages4.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("hierarchyWithSafeUsages5.kt") public void testHierarchyWithSafeUsages5() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages5.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("hierarchyWithUnsafeUsages1.kt") public void testHierarchyWithUnsafeUsages1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages1.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("hierarchyWithUnsafeUsages2.kt") public void testHierarchyWithUnsafeUsages2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages2.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("hierarchyWithUnsafeUsages3.kt") public void testHierarchyWithUnsafeUsages3() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages3.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("hierarchyWithUnsafeUsages4.kt") public void testHierarchyWithUnsafeUsages4() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages4.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("hierarchyWithUnsafeUsages5.kt") public void testHierarchyWithUnsafeUsages5() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages5.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("internalUsage1.kt") public void testInternalUsage1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage1.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("internalUsage2.kt") public void testInternalUsage2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("lambdaArg.kt") public void testLambdaArg() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("lambdaArgExt.kt") public void testLambdaArgExt() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("mixedHierarchy1.kt") public void testMixedHierarchy1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("mixedHierarchy2.kt") public void testMixedHierarchy2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy2.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("mixedHierarchy3.kt") public void testMixedHierarchy3() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy3.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("mixedHierarchyWithUnsafeUsages1.kt") public void testMixedHierarchyWithUnsafeUsages1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages1.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("mixedHierarchyWithUnsafeUsages2.kt") public void testMixedHierarchyWithUnsafeUsages2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages2.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("mixedHierarchyWithUnsafeUsages3.kt") public void testMixedHierarchyWithUnsafeUsages3() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("propertyParam1.kt") public void testPropertyParam1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("propertyParam2.kt") public void testPropertyParam2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("safeUsages1.kt") public void testSafeUsages1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("safeUsages2.kt") public void testSafeUsages2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages2.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("safeUsages3.kt") public void testSafeUsages3() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages3.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("safeUsagesExt1.kt") public void testSafeUsagesExt1() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt1.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("safeUsagesExt2.kt") public void testSafeUsagesExt2() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt2.kt"); doValueParameterTestWithJava(fileName); } }