PY-6637 Rename test data directory to "makeFunctionTopLevel" for consistency

diff --git a/python/testData/refactoring/convertTopLevel/localFunctionNonlocalReferenceToOuterScope.py b/python/testData/refactoring/makeFunctionTopLevel/localFunctionNonlocalReferenceToOuterScope.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/localFunctionNonlocalReferenceToOuterScope.py
rename to python/testData/refactoring/makeFunctionTopLevel/localFunctionNonlocalReferenceToOuterScope.py

diff --git a/python/testData/refactoring/convertTopLevel/localFunctionNonlocalReferencesInInnerFunction.after.py b/python/testData/refactoring/makeFunctionTopLevel/localFunctionNonlocalReferencesInInnerFunction.after.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/localFunctionNonlocalReferencesInInnerFunction.after.py
rename to python/testData/refactoring/makeFunctionTopLevel/localFunctionNonlocalReferencesInInnerFunction.after.py

diff --git a/python/testData/refactoring/convertTopLevel/localFunctionNonlocalReferencesInInnerFunction.py b/python/testData/refactoring/makeFunctionTopLevel/localFunctionNonlocalReferencesInInnerFunction.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/localFunctionNonlocalReferencesInInnerFunction.py
rename to python/testData/refactoring/makeFunctionTopLevel/localFunctionNonlocalReferencesInInnerFunction.py

diff --git a/python/testData/refactoring/convertTopLevel/localFunctionReferenceToSelf.py b/python/testData/refactoring/makeFunctionTopLevel/localFunctionReferenceToSelf.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/localFunctionReferenceToSelf.py
rename to python/testData/refactoring/makeFunctionTopLevel/localFunctionReferenceToSelf.py

diff --git a/python/testData/refactoring/convertTopLevel/localFunctionSimple.after.py b/python/testData/refactoring/makeFunctionTopLevel/localFunctionSimple.after.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/localFunctionSimple.after.py
rename to python/testData/refactoring/makeFunctionTopLevel/localFunctionSimple.after.py

diff --git a/python/testData/refactoring/convertTopLevel/localFunctionSimple.py b/python/testData/refactoring/makeFunctionTopLevel/localFunctionSimple.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/localFunctionSimple.py
rename to python/testData/refactoring/makeFunctionTopLevel/localFunctionSimple.py

diff --git a/python/testData/refactoring/convertTopLevel/methodAttributeWrites.py b/python/testData/refactoring/makeFunctionTopLevel/methodAttributeWrites.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodAttributeWrites.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodAttributeWrites.py

diff --git a/python/testData/refactoring/convertTopLevel/methodCalledViaClass.after.py b/python/testData/refactoring/makeFunctionTopLevel/methodCalledViaClass.after.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodCalledViaClass.after.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodCalledViaClass.after.py

diff --git a/python/testData/refactoring/convertTopLevel/methodCalledViaClass.py b/python/testData/refactoring/makeFunctionTopLevel/methodCalledViaClass.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodCalledViaClass.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodCalledViaClass.py

diff --git a/python/testData/refactoring/convertTopLevel/methodImportUpdates/after/main.py b/python/testData/refactoring/makeFunctionTopLevel/methodImportUpdates/after/main.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodImportUpdates/after/main.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodImportUpdates/after/main.py

diff --git a/python/testData/refactoring/convertTopLevel/methodImportUpdates/after/other.py b/python/testData/refactoring/makeFunctionTopLevel/methodImportUpdates/after/other.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodImportUpdates/after/other.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodImportUpdates/after/other.py

diff --git a/python/testData/refactoring/convertTopLevel/methodImportUpdates/before/main.py b/python/testData/refactoring/makeFunctionTopLevel/methodImportUpdates/before/main.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodImportUpdates/before/main.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodImportUpdates/before/main.py

diff --git a/python/testData/refactoring/convertTopLevel/methodImportUpdates/before/other.py b/python/testData/refactoring/makeFunctionTopLevel/methodImportUpdates/before/other.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodImportUpdates/before/other.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodImportUpdates/before/other.py

diff --git a/python/testData/refactoring/convertTopLevel/methodMultipleAttributesConstructorQualifier.after.py b/python/testData/refactoring/makeFunctionTopLevel/methodMultipleAttributesConstructorQualifier.after.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodMultipleAttributesConstructorQualifier.after.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodMultipleAttributesConstructorQualifier.after.py

diff --git a/python/testData/refactoring/convertTopLevel/methodMultipleAttributesConstructorQualifier.py b/python/testData/refactoring/makeFunctionTopLevel/methodMultipleAttributesConstructorQualifier.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodMultipleAttributesConstructorQualifier.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodMultipleAttributesConstructorQualifier.py

diff --git a/python/testData/refactoring/convertTopLevel/methodMultipleAttributesReadReferenceQualifier.after.py b/python/testData/refactoring/makeFunctionTopLevel/methodMultipleAttributesReadReferenceQualifier.after.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodMultipleAttributesReadReferenceQualifier.after.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodMultipleAttributesReadReferenceQualifier.after.py

diff --git a/python/testData/refactoring/convertTopLevel/methodMultipleAttributesReadReferenceQualifier.py b/python/testData/refactoring/makeFunctionTopLevel/methodMultipleAttributesReadReferenceQualifier.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodMultipleAttributesReadReferenceQualifier.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodMultipleAttributesReadReferenceQualifier.py

diff --git a/python/testData/refactoring/convertTopLevel/methodNoNewParams.after.py b/python/testData/refactoring/makeFunctionTopLevel/methodNoNewParams.after.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodNoNewParams.after.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodNoNewParams.after.py

diff --git a/python/testData/refactoring/convertTopLevel/methodNoNewParams.py b/python/testData/refactoring/makeFunctionTopLevel/methodNoNewParams.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodNoNewParams.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodNoNewParams.py

diff --git a/python/testData/refactoring/convertTopLevel/methodNonlocalReferenceToOuterScope.py b/python/testData/refactoring/makeFunctionTopLevel/methodNonlocalReferenceToOuterScope.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodNonlocalReferenceToOuterScope.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodNonlocalReferenceToOuterScope.py

diff --git a/python/testData/refactoring/convertTopLevel/methodOtherMethodCalls.py b/python/testData/refactoring/makeFunctionTopLevel/methodOtherMethodCalls.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodOtherMethodCalls.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodOtherMethodCalls.py

diff --git a/python/testData/refactoring/convertTopLevel/methodOuterScopeReads.py b/python/testData/refactoring/makeFunctionTopLevel/methodOuterScopeReads.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodOuterScopeReads.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodOuterScopeReads.py

diff --git a/python/testData/refactoring/convertTopLevel/methodOverriddenSelf.py b/python/testData/refactoring/makeFunctionTopLevel/methodOverriddenSelf.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodOverriddenSelf.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodOverriddenSelf.py

diff --git a/python/testData/refactoring/convertTopLevel/methodReadPrivateAttributes.py b/python/testData/refactoring/makeFunctionTopLevel/methodReadPrivateAttributes.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodReadPrivateAttributes.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodReadPrivateAttributes.py

diff --git a/python/testData/refactoring/convertTopLevel/methodSelfUsedAsOperand.py b/python/testData/refactoring/makeFunctionTopLevel/methodSelfUsedAsOperand.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodSelfUsedAsOperand.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodSelfUsedAsOperand.py

diff --git a/python/testData/refactoring/convertTopLevel/methodSingleAttributeRead.after.py b/python/testData/refactoring/makeFunctionTopLevel/methodSingleAttributeRead.after.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodSingleAttributeRead.after.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodSingleAttributeRead.after.py

diff --git a/python/testData/refactoring/convertTopLevel/methodSingleAttributeRead.py b/python/testData/refactoring/makeFunctionTopLevel/methodSingleAttributeRead.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodSingleAttributeRead.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodSingleAttributeRead.py

diff --git a/python/testData/refactoring/convertTopLevel/methodUniqueNameOfExtractedQualifier.after.py b/python/testData/refactoring/makeFunctionTopLevel/methodUniqueNameOfExtractedQualifier.after.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodUniqueNameOfExtractedQualifier.after.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodUniqueNameOfExtractedQualifier.after.py

diff --git a/python/testData/refactoring/convertTopLevel/methodUniqueNameOfExtractedQualifier.py b/python/testData/refactoring/makeFunctionTopLevel/methodUniqueNameOfExtractedQualifier.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodUniqueNameOfExtractedQualifier.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodUniqueNameOfExtractedQualifier.py

diff --git a/python/testData/refactoring/convertTopLevel/methodUniqueParamNames.after.py b/python/testData/refactoring/makeFunctionTopLevel/methodUniqueParamNames.after.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodUniqueParamNames.after.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodUniqueParamNames.after.py

diff --git a/python/testData/refactoring/convertTopLevel/methodUniqueParamNames.py b/python/testData/refactoring/makeFunctionTopLevel/methodUniqueParamNames.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/methodUniqueParamNames.py
rename to python/testData/refactoring/makeFunctionTopLevel/methodUniqueParamNames.py

diff --git a/python/testData/refactoring/convertTopLevel/recursiveLocalFunction.after.py b/python/testData/refactoring/makeFunctionTopLevel/recursiveLocalFunction.after.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/recursiveLocalFunction.after.py
rename to python/testData/refactoring/makeFunctionTopLevel/recursiveLocalFunction.after.py

diff --git a/python/testData/refactoring/convertTopLevel/recursiveLocalFunction.py b/python/testData/refactoring/makeFunctionTopLevel/recursiveLocalFunction.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/recursiveLocalFunction.py
rename to python/testData/refactoring/makeFunctionTopLevel/recursiveLocalFunction.py

diff --git a/python/testData/refactoring/convertTopLevel/recursiveMethod.after.py b/python/testData/refactoring/makeFunctionTopLevel/recursiveMethod.after.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/recursiveMethod.after.py
rename to python/testData/refactoring/makeFunctionTopLevel/recursiveMethod.after.py

diff --git a/python/testData/refactoring/convertTopLevel/recursiveMethod.py b/python/testData/refactoring/makeFunctionTopLevel/recursiveMethod.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/recursiveMethod.py
rename to python/testData/refactoring/makeFunctionTopLevel/recursiveMethod.py

diff --git a/python/testData/refactoring/convertTopLevel/refactoringAvailability.py b/python/testData/refactoring/makeFunctionTopLevel/refactoringAvailability.py
similarity index 100%
rename from python/testData/refactoring/convertTopLevel/refactoringAvailability.py
rename to python/testData/refactoring/makeFunctionTopLevel/refactoringAvailability.py

diff --git a/python/testSrc/com/jetbrains/python/refactoring/PyMakeFunctionTopLevelTest.java b/python/testSrc/com/jetbrains/python/refactoring/PyMakeFunctionTopLevelTest.java
index 612315e4aba5fb07b04c5fec9d9361ccd6cbb62e..6e8c3a8a791ab525231fc7405d9345f8c687c755 100644 (file)
--- a/python/testSrc/com/jetbrains/python/refactoring/PyMakeFunctionTopLevelTest.java
+++ b/python/testSrc/com/jetbrains/python/refactoring/PyMakeFunctionTopLevelTest.java
@@ -225,6 +225,6 @@ public class PyMakeFunctionTopLevelTest extends PyTestCase {
 
   @Override
   protected String getTestDataPath() {
-    return super.getTestDataPath() + "/refactoring/convertTopLevel/";
+    return super.getTestDataPath() + "/refactoring/makeFunctionTopLevel/";
   }
 }