diff --git a/python/testData/intentions/beforeAddMissingParamsInGoogleDocString.py b/python/testData/intentions/addMissingParamsInGoogleDocString.py similarity index 100% rename from python/testData/intentions/beforeAddMissingParamsInGoogleDocString.py rename to python/testData/intentions/addMissingParamsInGoogleDocString.py diff --git a/python/testData/intentions/beforeAddMissingParamsInGoogleDocStringEmptyParamSection.py b/python/testData/intentions/addMissingParamsInGoogleDocStringEmptyParamSection.py similarity index 100% rename from python/testData/intentions/beforeAddMissingParamsInGoogleDocStringEmptyParamSection.py rename to python/testData/intentions/addMissingParamsInGoogleDocStringEmptyParamSection.py diff --git a/python/testData/intentions/beforeAddMissingParamsInGoogleDocStringEmptyParamSectionCustomCodeIndent.py b/python/testData/intentions/addMissingParamsInGoogleDocStringEmptyParamSectionCustomCodeIndent.py similarity index 100% rename from python/testData/intentions/beforeAddMissingParamsInGoogleDocStringEmptyParamSectionCustomCodeIndent.py rename to python/testData/intentions/addMissingParamsInGoogleDocStringEmptyParamSectionCustomCodeIndent.py diff --git a/python/testData/intentions/afterAddMissingParamsInGoogleDocStringEmptyParamSectionCustomCodeIndent.py b/python/testData/intentions/addMissingParamsInGoogleDocStringEmptyParamSectionCustomCodeIndent_after.py similarity index 100% rename from python/testData/intentions/afterAddMissingParamsInGoogleDocStringEmptyParamSectionCustomCodeIndent.py rename to python/testData/intentions/addMissingParamsInGoogleDocStringEmptyParamSectionCustomCodeIndent_after.py diff --git a/python/testData/intentions/afterAddMissingParamsInGoogleDocStringEmptyParamSection.py b/python/testData/intentions/addMissingParamsInGoogleDocStringEmptyParamSection_after.py similarity index 100% rename from python/testData/intentions/afterAddMissingParamsInGoogleDocStringEmptyParamSection.py rename to python/testData/intentions/addMissingParamsInGoogleDocStringEmptyParamSection_after.py diff --git a/python/testData/intentions/beforeAddMissingParamsInGoogleDocStringNoParamSection.py b/python/testData/intentions/addMissingParamsInGoogleDocStringNoParamSection.py similarity index 100% rename from python/testData/intentions/beforeAddMissingParamsInGoogleDocStringNoParamSection.py rename to python/testData/intentions/addMissingParamsInGoogleDocStringNoParamSection.py diff --git a/python/testData/intentions/beforeAddMissingParamsInGoogleDocStringNoParamSectionCustomCodeIndent.py b/python/testData/intentions/addMissingParamsInGoogleDocStringNoParamSectionCustomCodeIndent.py similarity index 100% rename from python/testData/intentions/beforeAddMissingParamsInGoogleDocStringNoParamSectionCustomCodeIndent.py rename to python/testData/intentions/addMissingParamsInGoogleDocStringNoParamSectionCustomCodeIndent.py diff --git a/python/testData/intentions/afterAddMissingParamsInGoogleDocStringNoParamSectionCustomCodeIndent.py b/python/testData/intentions/addMissingParamsInGoogleDocStringNoParamSectionCustomCodeIndent_after.py similarity index 100% rename from python/testData/intentions/afterAddMissingParamsInGoogleDocStringNoParamSectionCustomCodeIndent.py rename to python/testData/intentions/addMissingParamsInGoogleDocStringNoParamSectionCustomCodeIndent_after.py diff --git a/python/testData/intentions/afterAddMissingParamsInGoogleDocStringNoParamSection.py b/python/testData/intentions/addMissingParamsInGoogleDocStringNoParamSection_after.py similarity index 100% rename from python/testData/intentions/afterAddMissingParamsInGoogleDocStringNoParamSection.py rename to python/testData/intentions/addMissingParamsInGoogleDocStringNoParamSection_after.py diff --git a/python/testData/intentions/afterAddMissingParamsInGoogleDocString.py b/python/testData/intentions/addMissingParamsInGoogleDocString_after.py similarity index 100% rename from python/testData/intentions/afterAddMissingParamsInGoogleDocString.py rename to python/testData/intentions/addMissingParamsInGoogleDocString_after.py diff --git a/python/testData/intentions/beforeAddMissingVarargsInGoogleDocString.py b/python/testData/intentions/addMissingVarargsInGoogleDocString.py similarity index 100% rename from python/testData/intentions/beforeAddMissingVarargsInGoogleDocString.py rename to python/testData/intentions/addMissingVarargsInGoogleDocString.py diff --git a/python/testData/intentions/afterAddMissingVarargsInGoogleDocString.py b/python/testData/intentions/addMissingVarargsInGoogleDocString_after.py similarity index 100% rename from python/testData/intentions/afterAddMissingVarargsInGoogleDocString.py rename to python/testData/intentions/addMissingVarargsInGoogleDocString_after.py diff --git a/python/testData/intentions/beforeConvertBuiltins.py b/python/testData/intentions/convertBuiltins.py similarity index 100% rename from python/testData/intentions/beforeConvertBuiltins.py rename to python/testData/intentions/convertBuiltins.py diff --git a/python/testData/intentions/afterConvertBuiltins.py b/python/testData/intentions/convertBuiltins_after.py similarity index 100% rename from python/testData/intentions/afterConvertBuiltins.py rename to python/testData/intentions/convertBuiltins_after.py diff --git a/python/testData/intentions/beforeConvertDictComp.py b/python/testData/intentions/convertDictComp.py similarity index 100% rename from python/testData/intentions/beforeConvertDictComp.py rename to python/testData/intentions/convertDictComp.py diff --git a/python/testData/intentions/afterConvertDictComp.py b/python/testData/intentions/convertDictComp_after.py similarity index 100% rename from python/testData/intentions/afterConvertDictComp.py rename to python/testData/intentions/convertDictComp_after.py diff --git a/python/testData/intentions/beforeConvertLambdaToFunction.py b/python/testData/intentions/convertLambdaToFunction.py similarity index 100% rename from python/testData/intentions/beforeConvertLambdaToFunction.py rename to python/testData/intentions/convertLambdaToFunction.py diff --git a/python/testData/intentions/beforeConvertLambdaToFunction1.py b/python/testData/intentions/convertLambdaToFunction1.py similarity index 100% rename from python/testData/intentions/beforeConvertLambdaToFunction1.py rename to python/testData/intentions/convertLambdaToFunction1.py diff --git a/python/testData/intentions/beforeConvertLambdaToFunction2.py b/python/testData/intentions/convertLambdaToFunction2.py similarity index 100% rename from python/testData/intentions/beforeConvertLambdaToFunction2.py rename to python/testData/intentions/convertLambdaToFunction2.py diff --git a/python/testData/intentions/afterConvertLambdaToFunction2.py b/python/testData/intentions/convertLambdaToFunction2_after.py similarity index 100% rename from python/testData/intentions/afterConvertLambdaToFunction2.py rename to python/testData/intentions/convertLambdaToFunction2_after.py diff --git a/python/testData/intentions/afterConvertLambdaToFunction.py b/python/testData/intentions/convertLambdaToFunction_after.py similarity index 100% rename from python/testData/intentions/afterConvertLambdaToFunction.py rename to python/testData/intentions/convertLambdaToFunction_after.py diff --git a/python/testData/intentions/beforeConvertSetLiteral.py b/python/testData/intentions/convertSetLiteral.py similarity index 100% rename from python/testData/intentions/beforeConvertSetLiteral.py rename to python/testData/intentions/convertSetLiteral.py diff --git a/python/testData/intentions/afterConvertSetLiteral.py b/python/testData/intentions/convertSetLiteral_after.py similarity index 100% rename from python/testData/intentions/afterConvertSetLiteral.py rename to python/testData/intentions/convertSetLiteral_after.py diff --git a/python/testData/intentions/beforeConvertStaticMethodToFunction.py b/python/testData/intentions/convertStaticMethodToFunction.py similarity index 100% rename from python/testData/intentions/beforeConvertStaticMethodToFunction.py rename to python/testData/intentions/convertStaticMethodToFunction.py diff --git a/python/testData/intentions/beforeConvertStaticMethodToFunctionUsage.py b/python/testData/intentions/convertStaticMethodToFunctionUsage.py similarity index 100% rename from python/testData/intentions/beforeConvertStaticMethodToFunctionUsage.py rename to python/testData/intentions/convertStaticMethodToFunctionUsage.py diff --git a/python/testData/intentions/afterConvertStaticMethodToFunctionUsage.py b/python/testData/intentions/convertStaticMethodToFunctionUsage_after.py similarity index 100% rename from python/testData/intentions/afterConvertStaticMethodToFunctionUsage.py rename to python/testData/intentions/convertStaticMethodToFunctionUsage_after.py diff --git a/python/testData/intentions/afterConvertStaticMethodToFunction.py b/python/testData/intentions/convertStaticMethodToFunction_after.py similarity index 100% rename from python/testData/intentions/afterConvertStaticMethodToFunction.py rename to python/testData/intentions/convertStaticMethodToFunction_after.py diff --git a/python/testData/intentions/beforeConvertTripleQuotedEmptyString.py b/python/testData/intentions/convertTripleQuotedEmptyString.py similarity index 100% rename from python/testData/intentions/beforeConvertTripleQuotedEmptyString.py rename to python/testData/intentions/convertTripleQuotedEmptyString.py diff --git a/python/testData/intentions/afterConvertTripleQuotedEmptyString.py b/python/testData/intentions/convertTripleQuotedEmptyString_after.py similarity index 100% rename from python/testData/intentions/afterConvertTripleQuotedEmptyString.py rename to python/testData/intentions/convertTripleQuotedEmptyString_after.py diff --git a/python/testData/intentions/beforeConvertTripleQuotedParenthesizedString.py b/python/testData/intentions/convertTripleQuotedParenthesizedString.py similarity index 100% rename from python/testData/intentions/beforeConvertTripleQuotedParenthesizedString.py rename to python/testData/intentions/convertTripleQuotedParenthesizedString.py diff --git a/python/testData/intentions/afterConvertTripleQuotedParenthesizedString.py b/python/testData/intentions/convertTripleQuotedParenthesizedString_after.py similarity index 100% rename from python/testData/intentions/afterConvertTripleQuotedParenthesizedString.py rename to python/testData/intentions/convertTripleQuotedParenthesizedString_after.py diff --git a/python/testData/intentions/beforeConvertTripleQuotedString.py b/python/testData/intentions/convertTripleQuotedString.py similarity index 100% rename from python/testData/intentions/beforeConvertTripleQuotedString.py rename to python/testData/intentions/convertTripleQuotedString.py diff --git a/python/testData/intentions/beforeConvertTripleQuotedString1.py b/python/testData/intentions/convertTripleQuotedString1.py similarity index 100% rename from python/testData/intentions/beforeConvertTripleQuotedString1.py rename to python/testData/intentions/convertTripleQuotedString1.py diff --git a/python/testData/intentions/afterConvertTripleQuotedString1.py b/python/testData/intentions/convertTripleQuotedString1_after.py similarity index 100% rename from python/testData/intentions/afterConvertTripleQuotedString1.py rename to python/testData/intentions/convertTripleQuotedString1_after.py diff --git a/python/testData/intentions/beforeConvertTripleQuotedStringDoesNotReplacePythonEscapes.py b/python/testData/intentions/convertTripleQuotedStringDoesNotReplacePythonEscapes.py similarity index 100% rename from python/testData/intentions/beforeConvertTripleQuotedStringDoesNotReplacePythonEscapes.py rename to python/testData/intentions/convertTripleQuotedStringDoesNotReplacePythonEscapes.py diff --git a/python/testData/intentions/afterConvertTripleQuotedStringDoesNotReplacePythonEscapes.py b/python/testData/intentions/convertTripleQuotedStringDoesNotReplacePythonEscapes_after.py similarity index 100% rename from python/testData/intentions/afterConvertTripleQuotedStringDoesNotReplacePythonEscapes.py rename to python/testData/intentions/convertTripleQuotedStringDoesNotReplacePythonEscapes_after.py diff --git a/python/testData/intentions/beforeConvertTripleQuotedStringInParenthesized.py b/python/testData/intentions/convertTripleQuotedStringInParenthesized.py similarity index 100% rename from python/testData/intentions/beforeConvertTripleQuotedStringInParenthesized.py rename to python/testData/intentions/convertTripleQuotedStringInParenthesized.py diff --git a/python/testData/intentions/afterConvertTripleQuotedStringInParenthesized.py b/python/testData/intentions/convertTripleQuotedStringInParenthesized_after.py similarity index 100% rename from python/testData/intentions/afterConvertTripleQuotedStringInParenthesized.py rename to python/testData/intentions/convertTripleQuotedStringInParenthesized_after.py diff --git a/python/testData/intentions/beforeConvertTripleQuotedStringMultilineGluedString.py b/python/testData/intentions/convertTripleQuotedStringMultilineGluedString.py similarity index 100% rename from python/testData/intentions/beforeConvertTripleQuotedStringMultilineGluedString.py rename to python/testData/intentions/convertTripleQuotedStringMultilineGluedString.py diff --git a/python/testData/intentions/afterConvertTripleQuotedStringMultilineGluedString.py b/python/testData/intentions/convertTripleQuotedStringMultilineGluedString_after.py similarity index 100% rename from python/testData/intentions/afterConvertTripleQuotedStringMultilineGluedString.py rename to python/testData/intentions/convertTripleQuotedStringMultilineGluedString_after.py diff --git a/python/testData/intentions/beforeConvertTripleQuotedStringRawStrings.py b/python/testData/intentions/convertTripleQuotedStringRawStrings.py similarity index 100% rename from python/testData/intentions/beforeConvertTripleQuotedStringRawStrings.py rename to python/testData/intentions/convertTripleQuotedStringRawStrings.py diff --git a/python/testData/intentions/afterConvertTripleQuotedStringRawStrings.py b/python/testData/intentions/convertTripleQuotedStringRawStrings_after.py similarity index 100% rename from python/testData/intentions/afterConvertTripleQuotedStringRawStrings.py rename to python/testData/intentions/convertTripleQuotedStringRawStrings_after.py diff --git a/python/testData/intentions/afterConvertTripleQuotedString.py b/python/testData/intentions/convertTripleQuotedString_after.py similarity index 100% rename from python/testData/intentions/afterConvertTripleQuotedString.py rename to python/testData/intentions/convertTripleQuotedString_after.py diff --git a/python/testData/intentions/beforeConvertTripleQuotedUnicodeString.py b/python/testData/intentions/convertTripleQuotedUnicodeString.py similarity index 100% rename from python/testData/intentions/beforeConvertTripleQuotedUnicodeString.py rename to python/testData/intentions/convertTripleQuotedUnicodeString.py diff --git a/python/testData/intentions/afterConvertTripleQuotedUnicodeString.py b/python/testData/intentions/convertTripleQuotedUnicodeString_after.py similarity index 100% rename from python/testData/intentions/afterConvertTripleQuotedUnicodeString.py rename to python/testData/intentions/convertTripleQuotedUnicodeString_after.py diff --git a/python/testData/intentions/beforeConvertVariadicParam.py b/python/testData/intentions/convertVariadicParam.py similarity index 100% rename from python/testData/intentions/beforeConvertVariadicParam.py rename to python/testData/intentions/convertVariadicParam.py diff --git a/python/testData/intentions/afterConvertVariadicParam.py b/python/testData/intentions/convertVariadicParam_after.py similarity index 100% rename from python/testData/intentions/afterConvertVariadicParam.py rename to python/testData/intentions/convertVariadicParam_after.py diff --git a/python/testData/intentions/beforeDictConstructorToLiteralForm.py b/python/testData/intentions/dictConstructorToLiteralForm.py similarity index 100% rename from python/testData/intentions/beforeDictConstructorToLiteralForm.py rename to python/testData/intentions/dictConstructorToLiteralForm.py diff --git a/python/testData/intentions/afterDictConstructorToLiteralForm.py b/python/testData/intentions/dictConstructorToLiteralForm_after.py similarity index 100% rename from python/testData/intentions/afterDictConstructorToLiteralForm.py rename to python/testData/intentions/dictConstructorToLiteralForm_after.py diff --git a/python/testData/intentions/beforeDictLiteralFormToConstructor.py b/python/testData/intentions/dictLiteralFormToConstructor.py similarity index 100% rename from python/testData/intentions/beforeDictLiteralFormToConstructor.py rename to python/testData/intentions/dictLiteralFormToConstructor.py diff --git a/python/testData/intentions/beforeDictLiteralFormToConstructor1.py b/python/testData/intentions/dictLiteralFormToConstructor1.py similarity index 100% rename from python/testData/intentions/beforeDictLiteralFormToConstructor1.py rename to python/testData/intentions/dictLiteralFormToConstructor1.py diff --git a/python/testData/intentions/beforeDictLiteralFormToConstructor2.py b/python/testData/intentions/dictLiteralFormToConstructor2.py similarity index 100% rename from python/testData/intentions/beforeDictLiteralFormToConstructor2.py rename to python/testData/intentions/dictLiteralFormToConstructor2.py diff --git a/python/testData/intentions/beforeDictLiteralFormToConstructor3.py b/python/testData/intentions/dictLiteralFormToConstructor3.py similarity index 100% rename from python/testData/intentions/beforeDictLiteralFormToConstructor3.py rename to python/testData/intentions/dictLiteralFormToConstructor3.py diff --git a/python/testData/intentions/afterDictLiteralFormToConstructor.py b/python/testData/intentions/dictLiteralFormToConstructor_after.py similarity index 100% rename from python/testData/intentions/afterDictLiteralFormToConstructor.py rename to python/testData/intentions/dictLiteralFormToConstructor_after.py diff --git a/python/testData/intentions/beforeDocStub.py b/python/testData/intentions/docStub.py similarity index 100% rename from python/testData/intentions/beforeDocStub.py rename to python/testData/intentions/docStub.py diff --git a/python/testData/intentions/beforeDocStubKeywordOnly.py b/python/testData/intentions/docStubKeywordOnly.py similarity index 100% rename from python/testData/intentions/beforeDocStubKeywordOnly.py rename to python/testData/intentions/docStubKeywordOnly.py diff --git a/python/testData/intentions/afterDocStubKeywordOnly.py b/python/testData/intentions/docStubKeywordOnly_after.py similarity index 100% rename from python/testData/intentions/afterDocStubKeywordOnly.py rename to python/testData/intentions/docStubKeywordOnly_after.py diff --git a/python/testData/intentions/afterDocStub.py b/python/testData/intentions/docStub_after.py similarity index 100% rename from python/testData/intentions/afterDocStub.py rename to python/testData/intentions/docStub_after.py diff --git a/python/testData/intentions/beforeDoubledQuotedString.py b/python/testData/intentions/doubledQuotedString.py similarity index 100% rename from python/testData/intentions/beforeDoubledQuotedString.py rename to python/testData/intentions/doubledQuotedString.py diff --git a/python/testData/intentions/afterDoubledQuotedString.py b/python/testData/intentions/doubledQuotedString_after.py similarity index 100% rename from python/testData/intentions/afterDoubledQuotedString.py rename to python/testData/intentions/doubledQuotedString_after.py diff --git a/python/testData/intentions/beforeEscapedQuotedString.py b/python/testData/intentions/escapedQuotedString.py similarity index 100% rename from python/testData/intentions/beforeEscapedQuotedString.py rename to python/testData/intentions/escapedQuotedString.py diff --git a/python/testData/intentions/afterEscapedQuotedString.py b/python/testData/intentions/escapedQuotedString_after.py similarity index 100% rename from python/testData/intentions/afterEscapedQuotedString.py rename to python/testData/intentions/escapedQuotedString_after.py diff --git a/python/testData/intentions/beforeFlipComparison.py b/python/testData/intentions/flipComparison.py similarity index 100% rename from python/testData/intentions/beforeFlipComparison.py rename to python/testData/intentions/flipComparison.py diff --git a/python/testData/intentions/afterFlipComparison.py b/python/testData/intentions/flipComparison_after.py similarity index 100% rename from python/testData/intentions/afterFlipComparison.py rename to python/testData/intentions/flipComparison_after.py diff --git a/python/testData/intentions/beforeGoogleDocStubCustomIndent.py b/python/testData/intentions/googleDocStubCustomIndent.py similarity index 100% rename from python/testData/intentions/beforeGoogleDocStubCustomIndent.py rename to python/testData/intentions/googleDocStubCustomIndent.py diff --git a/python/testData/intentions/afterGoogleDocStubCustomIndent.py b/python/testData/intentions/googleDocStubCustomIndent_after.py similarity index 100% rename from python/testData/intentions/afterGoogleDocStubCustomIndent.py rename to python/testData/intentions/googleDocStubCustomIndent_after.py diff --git a/python/testData/intentions/beforeGoogleDocStubEmptyFunctionBody.py b/python/testData/intentions/googleDocStubEmptyFunctionBody.py similarity index 100% rename from python/testData/intentions/beforeGoogleDocStubEmptyFunctionBody.py rename to python/testData/intentions/googleDocStubEmptyFunctionBody.py diff --git a/python/testData/intentions/afterGoogleDocStubEmptyFunctionBody.py b/python/testData/intentions/googleDocStubEmptyFunctionBody_after.py similarity index 100% rename from python/testData/intentions/afterGoogleDocStubEmptyFunctionBody.py rename to python/testData/intentions/googleDocStubEmptyFunctionBody_after.py diff --git a/python/testData/intentions/beforeGoogleDocStubInlineFunctionBody.py b/python/testData/intentions/googleDocStubInlineFunctionBody.py similarity index 100% rename from python/testData/intentions/beforeGoogleDocStubInlineFunctionBody.py rename to python/testData/intentions/googleDocStubInlineFunctionBody.py diff --git a/python/testData/intentions/beforeGoogleDocStubInlineFunctionBodyMultilineParametersList.py b/python/testData/intentions/googleDocStubInlineFunctionBodyMultilineParametersList.py similarity index 100% rename from python/testData/intentions/beforeGoogleDocStubInlineFunctionBodyMultilineParametersList.py rename to python/testData/intentions/googleDocStubInlineFunctionBodyMultilineParametersList.py diff --git a/python/testData/intentions/afterGoogleDocStubInlineFunctionBodyMultilineParametersList.py b/python/testData/intentions/googleDocStubInlineFunctionBodyMultilineParametersList_after.py similarity index 100% rename from python/testData/intentions/afterGoogleDocStubInlineFunctionBodyMultilineParametersList.py rename to python/testData/intentions/googleDocStubInlineFunctionBodyMultilineParametersList_after.py diff --git a/python/testData/intentions/beforeGoogleDocStubInlineFunctionBodyNoSpaceBefore.py b/python/testData/intentions/googleDocStubInlineFunctionBodyNoSpaceBefore.py similarity index 100% rename from python/testData/intentions/beforeGoogleDocStubInlineFunctionBodyNoSpaceBefore.py rename to python/testData/intentions/googleDocStubInlineFunctionBodyNoSpaceBefore.py diff --git a/python/testData/intentions/afterGoogleDocStubInlineFunctionBody.py b/python/testData/intentions/googleDocStubInlineFunctionBodyNoSpaceBefore_after.py similarity index 100% rename from python/testData/intentions/afterGoogleDocStubInlineFunctionBody.py rename to python/testData/intentions/googleDocStubInlineFunctionBodyNoSpaceBefore_after.py diff --git a/python/testData/intentions/afterGoogleDocStubInlineFunctionBodyNoSpaceBefore.py b/python/testData/intentions/googleDocStubInlineFunctionBody_after.py similarity index 100% rename from python/testData/intentions/afterGoogleDocStubInlineFunctionBodyNoSpaceBefore.py rename to python/testData/intentions/googleDocStubInlineFunctionBody_after.py diff --git a/python/testData/intentions/beforeGoogleDocStubWithTypes.py b/python/testData/intentions/googleDocStubWithTypes.py similarity index 100% rename from python/testData/intentions/beforeGoogleDocStubWithTypes.py rename to python/testData/intentions/googleDocStubWithTypes.py diff --git a/python/testData/intentions/afterGoogleDocStubWithTypes.py b/python/testData/intentions/googleDocStubWithTypes_after.py similarity index 100% rename from python/testData/intentions/afterGoogleDocStubWithTypes.py rename to python/testData/intentions/googleDocStubWithTypes_after.py diff --git a/python/testData/intentions/beforeGoogleNoReturnSectionForInit.py b/python/testData/intentions/googleNoReturnSectionForInit.py similarity index 100% rename from python/testData/intentions/beforeGoogleNoReturnSectionForInit.py rename to python/testData/intentions/googleNoReturnSectionForInit.py diff --git a/python/testData/intentions/afterGoogleNoReturnSectionForInit.py b/python/testData/intentions/googleNoReturnSectionForInit_after.py similarity index 100% rename from python/testData/intentions/afterGoogleNoReturnSectionForInit.py rename to python/testData/intentions/googleNoReturnSectionForInit_after.py diff --git a/python/testData/intentions/beforeGoogleReturnSectionAfterKeywords.py b/python/testData/intentions/googleReturnSectionAfterKeywords.py similarity index 100% rename from python/testData/intentions/beforeGoogleReturnSectionAfterKeywords.py rename to python/testData/intentions/googleReturnSectionAfterKeywords.py diff --git a/python/testData/intentions/afterGoogleReturnSectionAfterKeywords.py b/python/testData/intentions/googleReturnSectionAfterKeywords_after.py similarity index 100% rename from python/testData/intentions/afterGoogleReturnSectionAfterKeywords.py rename to python/testData/intentions/googleReturnSectionAfterKeywords_after.py diff --git a/python/testData/intentions/beforeGoogleReturnSectionAfterYields.py b/python/testData/intentions/googleReturnSectionAfterYields.py similarity index 100% rename from python/testData/intentions/beforeGoogleReturnSectionAfterYields.py rename to python/testData/intentions/googleReturnSectionAfterYields.py diff --git a/python/testData/intentions/afterGoogleReturnSectionAfterYields.py b/python/testData/intentions/googleReturnSectionAfterYields_after.py similarity index 100% rename from python/testData/intentions/afterGoogleReturnSectionAfterYields.py rename to python/testData/intentions/googleReturnSectionAfterYields_after.py diff --git a/python/testData/intentions/beforeGoogleReturnSectionBeforeRaises.py b/python/testData/intentions/googleReturnSectionBeforeRaises.py similarity index 100% rename from python/testData/intentions/beforeGoogleReturnSectionBeforeRaises.py rename to python/testData/intentions/googleReturnSectionBeforeRaises.py diff --git a/python/testData/intentions/afterGoogleReturnSectionBeforeRaises.py b/python/testData/intentions/googleReturnSectionBeforeRaises_after.py similarity index 100% rename from python/testData/intentions/afterGoogleReturnSectionBeforeRaises.py rename to python/testData/intentions/googleReturnSectionBeforeRaises_after.py diff --git a/python/testData/intentions/beforeImportFromToImport.py b/python/testData/intentions/importFromToImport.py similarity index 100% rename from python/testData/intentions/beforeImportFromToImport.py rename to python/testData/intentions/importFromToImport.py diff --git a/python/testData/intentions/afterImportFromToImport.py b/python/testData/intentions/importFromToImport_after.py similarity index 100% rename from python/testData/intentions/afterImportFromToImport.py rename to python/testData/intentions/importFromToImport_after.py diff --git a/python/testData/intentions/beforeImportToImportFrom.py b/python/testData/intentions/importToImportFrom.py similarity index 100% rename from python/testData/intentions/beforeImportToImportFrom.py rename to python/testData/intentions/importToImportFrom.py diff --git a/python/testData/intentions/afterImportToImportFrom.py b/python/testData/intentions/importToImportFrom_after.py similarity index 100% rename from python/testData/intentions/afterImportToImportFrom.py rename to python/testData/intentions/importToImportFrom_after.py diff --git a/python/testData/intentions/beforeJoinIf.py b/python/testData/intentions/joinIf.py similarity index 100% rename from python/testData/intentions/beforeJoinIf.py rename to python/testData/intentions/joinIf.py diff --git a/python/testData/intentions/beforeJoinIfBinary.py b/python/testData/intentions/joinIfBinary.py similarity index 100% rename from python/testData/intentions/beforeJoinIfBinary.py rename to python/testData/intentions/joinIfBinary.py diff --git a/python/testData/intentions/afterJoinIfBinary.py b/python/testData/intentions/joinIfBinary_after.py similarity index 100% rename from python/testData/intentions/afterJoinIfBinary.py rename to python/testData/intentions/joinIfBinary_after.py diff --git a/python/testData/intentions/beforeJoinIfElse.py b/python/testData/intentions/joinIfElse.py similarity index 100% rename from python/testData/intentions/beforeJoinIfElse.py rename to python/testData/intentions/joinIfElse.py diff --git a/python/testData/intentions/beforeJoinIfMultiStatements.py b/python/testData/intentions/joinIfMultiStatements.py similarity index 100% rename from python/testData/intentions/beforeJoinIfMultiStatements.py rename to python/testData/intentions/joinIfMultiStatements.py diff --git a/python/testData/intentions/afterJoinIf.py b/python/testData/intentions/joinIf_after.py similarity index 100% rename from python/testData/intentions/afterJoinIf.py rename to python/testData/intentions/joinIf_after.py diff --git a/python/testData/intentions/beforeKeywordVarargTypeInGoogleDocString.py b/python/testData/intentions/keywordVarargTypeInGoogleDocString.py similarity index 100% rename from python/testData/intentions/beforeKeywordVarargTypeInGoogleDocString.py rename to python/testData/intentions/keywordVarargTypeInGoogleDocString.py diff --git a/python/testData/intentions/afterKeywordVarargTypeInGoogleDocString.py b/python/testData/intentions/keywordVarargTypeInGoogleDocString_after.py similarity index 100% rename from python/testData/intentions/afterKeywordVarargTypeInGoogleDocString.py rename to python/testData/intentions/keywordVarargTypeInGoogleDocString_after.py diff --git a/python/testData/intentions/beforeMultilineQuotedString.py b/python/testData/intentions/multilineQuotedString.py similarity index 100% rename from python/testData/intentions/beforeMultilineQuotedString.py rename to python/testData/intentions/multilineQuotedString.py diff --git a/python/testData/intentions/afterMultilineQuotedString.py b/python/testData/intentions/multilineQuotedString_after.py similarity index 100% rename from python/testData/intentions/afterMultilineQuotedString.py rename to python/testData/intentions/multilineQuotedString_after.py diff --git a/python/testData/intentions/beforeNegateComparison.py b/python/testData/intentions/negateComparison.py similarity index 100% rename from python/testData/intentions/beforeNegateComparison.py rename to python/testData/intentions/negateComparison.py diff --git a/python/testData/intentions/beforeNegateComparison2.py b/python/testData/intentions/negateComparison2.py similarity index 100% rename from python/testData/intentions/beforeNegateComparison2.py rename to python/testData/intentions/negateComparison2.py diff --git a/python/testData/intentions/afterNegateComparison2.py b/python/testData/intentions/negateComparison2_after.py similarity index 100% rename from python/testData/intentions/afterNegateComparison2.py rename to python/testData/intentions/negateComparison2_after.py diff --git a/python/testData/intentions/afterNegateComparison.py b/python/testData/intentions/negateComparison_after.py similarity index 100% rename from python/testData/intentions/afterNegateComparison.py rename to python/testData/intentions/negateComparison_after.py diff --git a/python/testData/intentions/beforeNumpyAddMissingParameterPreservesNoneIndent.py b/python/testData/intentions/numpyAddMissingParameterPreservesNoneIndent.py similarity index 100% rename from python/testData/intentions/beforeNumpyAddMissingParameterPreservesNoneIndent.py rename to python/testData/intentions/numpyAddMissingParameterPreservesNoneIndent.py diff --git a/python/testData/intentions/afterNumpyAddMissingParameterPreservesNoneIndent.py b/python/testData/intentions/numpyAddMissingParameterPreservesNoneIndent_after.py similarity index 100% rename from python/testData/intentions/afterNumpyAddMissingParameterPreservesNoneIndent.py rename to python/testData/intentions/numpyAddMissingParameterPreservesNoneIndent_after.py diff --git a/python/testData/intentions/beforeNumpyDocStub.py b/python/testData/intentions/numpyDocStub.py similarity index 100% rename from python/testData/intentions/beforeNumpyDocStub.py rename to python/testData/intentions/numpyDocStub.py diff --git a/python/testData/intentions/beforeNumpyDocStubWithTypes.py b/python/testData/intentions/numpyDocStubWithTypes.py similarity index 100% rename from python/testData/intentions/beforeNumpyDocStubWithTypes.py rename to python/testData/intentions/numpyDocStubWithTypes.py diff --git a/python/testData/intentions/afterNumpyDocStubWithTypes.py b/python/testData/intentions/numpyDocStubWithTypes_after.py similarity index 100% rename from python/testData/intentions/afterNumpyDocStubWithTypes.py rename to python/testData/intentions/numpyDocStubWithTypes_after.py diff --git a/python/testData/intentions/afterNumpyDocStub.py b/python/testData/intentions/numpyDocStub_after.py similarity index 100% rename from python/testData/intentions/afterNumpyDocStub.py rename to python/testData/intentions/numpyDocStub_after.py diff --git a/python/testData/intentions/beforeOneLineDocStub.py b/python/testData/intentions/oneLineDocStub.py similarity index 100% rename from python/testData/intentions/beforeOneLineDocStub.py rename to python/testData/intentions/oneLineDocStub.py diff --git a/python/testData/intentions/afterOneLineDocStub.py b/python/testData/intentions/oneLineDocStub_after.py similarity index 100% rename from python/testData/intentions/afterOneLineDocStub.py rename to python/testData/intentions/oneLineDocStub_after.py diff --git a/python/testData/intentions/beforeParamSectionBeforeKeywords.py b/python/testData/intentions/paramSectionBeforeKeywords.py similarity index 100% rename from python/testData/intentions/beforeParamSectionBeforeKeywords.py rename to python/testData/intentions/paramSectionBeforeKeywords.py diff --git a/python/testData/intentions/afterParamSectionBeforeKeywords.py b/python/testData/intentions/paramSectionBeforeKeywords_after.py similarity index 100% rename from python/testData/intentions/afterParamSectionBeforeKeywords.py rename to python/testData/intentions/paramSectionBeforeKeywords_after.py diff --git a/python/testData/intentions/beforeParamTypeInEmptyGoogleDocString.py b/python/testData/intentions/paramTypeInEmptyGoogleDocString.py similarity index 100% rename from python/testData/intentions/beforeParamTypeInEmptyGoogleDocString.py rename to python/testData/intentions/paramTypeInEmptyGoogleDocString.py diff --git a/python/testData/intentions/afterParamTypeInEmptyGoogleDocString.py b/python/testData/intentions/paramTypeInEmptyGoogleDocString_after.py similarity index 100% rename from python/testData/intentions/afterParamTypeInEmptyGoogleDocString.py rename to python/testData/intentions/paramTypeInEmptyGoogleDocString_after.py diff --git a/python/testData/intentions/beforeParamTypeInEmptyNumpyDocString.py b/python/testData/intentions/paramTypeInEmptyNumpyDocString.py similarity index 100% rename from python/testData/intentions/beforeParamTypeInEmptyNumpyDocString.py rename to python/testData/intentions/paramTypeInEmptyNumpyDocString.py diff --git a/python/testData/intentions/afterParamTypeInEmptyNumpyDocString.py b/python/testData/intentions/paramTypeInEmptyNumpyDocString_after.py similarity index 100% rename from python/testData/intentions/afterParamTypeInEmptyNumpyDocString.py rename to python/testData/intentions/paramTypeInEmptyNumpyDocString_after.py diff --git a/python/testData/intentions/beforeParamTypeInGoogleDocStringEmptyParamSection.py b/python/testData/intentions/paramTypeInGoogleDocStringEmptyParamSection.py similarity index 100% rename from python/testData/intentions/beforeParamTypeInGoogleDocStringEmptyParamSection.py rename to python/testData/intentions/paramTypeInGoogleDocStringEmptyParamSection.py diff --git a/python/testData/intentions/afterParamTypeInGoogleDocStringEmptyParamSection.py b/python/testData/intentions/paramTypeInGoogleDocStringEmptyParamSection_after.py similarity index 100% rename from python/testData/intentions/afterParamTypeInGoogleDocStringEmptyParamSection.py rename to python/testData/intentions/paramTypeInGoogleDocStringEmptyParamSection_after.py diff --git a/python/testData/intentions/beforeParamTypeInGoogleDocStringOnlySummary.py b/python/testData/intentions/paramTypeInGoogleDocStringOnlySummary.py similarity index 100% rename from python/testData/intentions/beforeParamTypeInGoogleDocStringOnlySummary.py rename to python/testData/intentions/paramTypeInGoogleDocStringOnlySummary.py diff --git a/python/testData/intentions/beforeParamTypeInGoogleDocStringOnlySummaryOneLine.py b/python/testData/intentions/paramTypeInGoogleDocStringOnlySummaryOneLine.py similarity index 100% rename from python/testData/intentions/beforeParamTypeInGoogleDocStringOnlySummaryOneLine.py rename to python/testData/intentions/paramTypeInGoogleDocStringOnlySummaryOneLine.py diff --git a/python/testData/intentions/afterParamTypeInGoogleDocStringOnlySummaryOneLine.py b/python/testData/intentions/paramTypeInGoogleDocStringOnlySummaryOneLine_after.py similarity index 100% rename from python/testData/intentions/afterParamTypeInGoogleDocStringOnlySummaryOneLine.py rename to python/testData/intentions/paramTypeInGoogleDocStringOnlySummaryOneLine_after.py diff --git a/python/testData/intentions/afterParamTypeInGoogleDocStringOnlySummary.py b/python/testData/intentions/paramTypeInGoogleDocStringOnlySummary_after.py similarity index 100% rename from python/testData/intentions/afterParamTypeInGoogleDocStringOnlySummary.py rename to python/testData/intentions/paramTypeInGoogleDocStringOnlySummary_after.py diff --git a/python/testData/intentions/beforeParamTypeInGoogleDocStringOtherParamDeclared.py b/python/testData/intentions/paramTypeInGoogleDocStringOtherParamDeclared.py similarity index 100% rename from python/testData/intentions/beforeParamTypeInGoogleDocStringOtherParamDeclared.py rename to python/testData/intentions/paramTypeInGoogleDocStringOtherParamDeclared.py diff --git a/python/testData/intentions/afterParamTypeInGoogleDocStringOtherParamDeclared.py b/python/testData/intentions/paramTypeInGoogleDocStringOtherParamDeclared_after.py similarity index 100% rename from python/testData/intentions/afterParamTypeInGoogleDocStringOtherParamDeclared.py rename to python/testData/intentions/paramTypeInGoogleDocStringOtherParamDeclared_after.py diff --git a/python/testData/intentions/beforeParamTypeInGoogleDocStringOtherSectionExists.py b/python/testData/intentions/paramTypeInGoogleDocStringOtherSectionExists.py similarity index 100% rename from python/testData/intentions/beforeParamTypeInGoogleDocStringOtherSectionExists.py rename to python/testData/intentions/paramTypeInGoogleDocStringOtherSectionExists.py diff --git a/python/testData/intentions/afterParamTypeInGoogleDocStringOtherSectionExists.py b/python/testData/intentions/paramTypeInGoogleDocStringOtherSectionExists_after.py similarity index 100% rename from python/testData/intentions/afterParamTypeInGoogleDocStringOtherSectionExists.py rename to python/testData/intentions/paramTypeInGoogleDocStringOtherSectionExists_after.py diff --git a/python/testData/intentions/beforeParamTypeInGoogleDocStringParamDeclaredEmptyParenthesis.py b/python/testData/intentions/paramTypeInGoogleDocStringParamDeclaredEmptyParenthesis.py similarity index 100% rename from python/testData/intentions/beforeParamTypeInGoogleDocStringParamDeclaredEmptyParenthesis.py rename to python/testData/intentions/paramTypeInGoogleDocStringParamDeclaredEmptyParenthesis.py diff --git a/python/testData/intentions/afterParamTypeInGoogleDocStringParamDeclaredEmptyParenthesis.py b/python/testData/intentions/paramTypeInGoogleDocStringParamDeclaredEmptyParenthesis_after.py similarity index 100% rename from python/testData/intentions/afterParamTypeInGoogleDocStringParamDeclaredEmptyParenthesis.py rename to python/testData/intentions/paramTypeInGoogleDocStringParamDeclaredEmptyParenthesis_after.py diff --git a/python/testData/intentions/beforeParamTypeInGoogleDocStringParamDeclaredNoParenthesis.py b/python/testData/intentions/paramTypeInGoogleDocStringParamDeclaredNoParenthesis.py similarity index 100% rename from python/testData/intentions/beforeParamTypeInGoogleDocStringParamDeclaredNoParenthesis.py rename to python/testData/intentions/paramTypeInGoogleDocStringParamDeclaredNoParenthesis.py diff --git a/python/testData/intentions/afterParamTypeInGoogleDocStringParamDeclaredNoParenthesis.py b/python/testData/intentions/paramTypeInGoogleDocStringParamDeclaredNoParenthesis_after.py similarity index 100% rename from python/testData/intentions/afterParamTypeInGoogleDocStringParamDeclaredNoParenthesis.py rename to python/testData/intentions/paramTypeInGoogleDocStringParamDeclaredNoParenthesis_after.py diff --git a/python/testData/intentions/beforeParamTypeInNewGoogleDocString.py b/python/testData/intentions/paramTypeInNewGoogleDocString.py similarity index 100% rename from python/testData/intentions/beforeParamTypeInNewGoogleDocString.py rename to python/testData/intentions/paramTypeInNewGoogleDocString.py diff --git a/python/testData/intentions/afterParamTypeInNewGoogleDocString.py b/python/testData/intentions/paramTypeInNewGoogleDocString_after.py similarity index 100% rename from python/testData/intentions/afterParamTypeInNewGoogleDocString.py rename to python/testData/intentions/paramTypeInNewGoogleDocString_after.py diff --git a/python/testData/intentions/beforeParamTypeInNewNumpyDocString.py b/python/testData/intentions/paramTypeInNewNumpyDocString.py similarity index 100% rename from python/testData/intentions/beforeParamTypeInNewNumpyDocString.py rename to python/testData/intentions/paramTypeInNewNumpyDocString.py diff --git a/python/testData/intentions/afterParamTypeInNewNumpyDocString.py b/python/testData/intentions/paramTypeInNewNumpyDocString_after.py similarity index 100% rename from python/testData/intentions/afterParamTypeInNewNumpyDocString.py rename to python/testData/intentions/paramTypeInNewNumpyDocString_after.py diff --git a/python/testData/intentions/beforeParamTypeInNumpyDocStringCombinedParams.py b/python/testData/intentions/paramTypeInNumpyDocStringCombinedParams.py similarity index 100% rename from python/testData/intentions/beforeParamTypeInNumpyDocStringCombinedParams.py rename to python/testData/intentions/paramTypeInNumpyDocStringCombinedParams.py diff --git a/python/testData/intentions/beforeParamTypeInNumpyDocStringCombinedParamsColon.py b/python/testData/intentions/paramTypeInNumpyDocStringCombinedParamsColon.py similarity index 100% rename from python/testData/intentions/beforeParamTypeInNumpyDocStringCombinedParamsColon.py rename to python/testData/intentions/paramTypeInNumpyDocStringCombinedParamsColon.py diff --git a/python/testData/intentions/afterParamTypeInNumpyDocStringCombinedParams.py b/python/testData/intentions/paramTypeInNumpyDocStringCombinedParamsColon_after.py similarity index 100% rename from python/testData/intentions/afterParamTypeInNumpyDocStringCombinedParams.py rename to python/testData/intentions/paramTypeInNumpyDocStringCombinedParamsColon_after.py diff --git a/python/testData/intentions/afterParamTypeInNumpyDocStringCombinedParamsColon.py b/python/testData/intentions/paramTypeInNumpyDocStringCombinedParams_after.py similarity index 100% rename from python/testData/intentions/afterParamTypeInNumpyDocStringCombinedParamsColon.py rename to python/testData/intentions/paramTypeInNumpyDocStringCombinedParams_after.py diff --git a/python/testData/intentions/beforeParamTypeInNumpyDocStringEmptyParamSection.py b/python/testData/intentions/paramTypeInNumpyDocStringEmptyParamSection.py similarity index 100% rename from python/testData/intentions/beforeParamTypeInNumpyDocStringEmptyParamSection.py rename to python/testData/intentions/paramTypeInNumpyDocStringEmptyParamSection.py diff --git a/python/testData/intentions/afterParamTypeInNumpyDocStringEmptyParamSection.py b/python/testData/intentions/paramTypeInNumpyDocStringEmptyParamSection_after.py similarity index 100% rename from python/testData/intentions/afterParamTypeInNumpyDocStringEmptyParamSection.py rename to python/testData/intentions/paramTypeInNumpyDocStringEmptyParamSection_after.py diff --git a/python/testData/intentions/beforeParamTypeInNumpyDocStringOnlySummary.py b/python/testData/intentions/paramTypeInNumpyDocStringOnlySummary.py similarity index 100% rename from python/testData/intentions/beforeParamTypeInNumpyDocStringOnlySummary.py rename to python/testData/intentions/paramTypeInNumpyDocStringOnlySummary.py diff --git a/python/testData/intentions/beforeParamTypeInNumpyDocStringOnlySummaryOneLine.py b/python/testData/intentions/paramTypeInNumpyDocStringOnlySummaryOneLine.py similarity index 100% rename from python/testData/intentions/beforeParamTypeInNumpyDocStringOnlySummaryOneLine.py rename to python/testData/intentions/paramTypeInNumpyDocStringOnlySummaryOneLine.py diff --git a/python/testData/intentions/afterParamTypeInNumpyDocStringOnlySummaryOneLine.py b/python/testData/intentions/paramTypeInNumpyDocStringOnlySummaryOneLine_after.py similarity index 100% rename from python/testData/intentions/afterParamTypeInNumpyDocStringOnlySummaryOneLine.py rename to python/testData/intentions/paramTypeInNumpyDocStringOnlySummaryOneLine_after.py diff --git a/python/testData/intentions/afterParamTypeInNumpyDocStringOnlySummary.py b/python/testData/intentions/paramTypeInNumpyDocStringOnlySummary_after.py similarity index 100% rename from python/testData/intentions/afterParamTypeInNumpyDocStringOnlySummary.py rename to python/testData/intentions/paramTypeInNumpyDocStringOnlySummary_after.py diff --git a/python/testData/intentions/beforeParamTypeInNumpyDocStringOtherParamDeclared.py b/python/testData/intentions/paramTypeInNumpyDocStringOtherParamDeclared.py similarity index 100% rename from python/testData/intentions/beforeParamTypeInNumpyDocStringOtherParamDeclared.py rename to python/testData/intentions/paramTypeInNumpyDocStringOtherParamDeclared.py diff --git a/python/testData/intentions/afterParamTypeInNumpyDocStringOtherParamDeclared.py b/python/testData/intentions/paramTypeInNumpyDocStringOtherParamDeclared_after.py similarity index 100% rename from python/testData/intentions/afterParamTypeInNumpyDocStringOtherParamDeclared.py rename to python/testData/intentions/paramTypeInNumpyDocStringOtherParamDeclared_after.py diff --git a/python/testData/intentions/beforeParamTypeInNumpyDocStringOtherSectionExists.py b/python/testData/intentions/paramTypeInNumpyDocStringOtherSectionExists.py similarity index 100% rename from python/testData/intentions/beforeParamTypeInNumpyDocStringOtherSectionExists.py rename to python/testData/intentions/paramTypeInNumpyDocStringOtherSectionExists.py diff --git a/python/testData/intentions/afterParamTypeInNumpyDocStringOtherSectionExists.py b/python/testData/intentions/paramTypeInNumpyDocStringOtherSectionExists_after.py similarity index 100% rename from python/testData/intentions/afterParamTypeInNumpyDocStringOtherSectionExists.py rename to python/testData/intentions/paramTypeInNumpyDocStringOtherSectionExists_after.py diff --git a/python/testData/intentions/beforeParamTypeInNumpyDocStringParamDeclaredColon.py b/python/testData/intentions/paramTypeInNumpyDocStringParamDeclaredColon.py similarity index 100% rename from python/testData/intentions/beforeParamTypeInNumpyDocStringParamDeclaredColon.py rename to python/testData/intentions/paramTypeInNumpyDocStringParamDeclaredColon.py diff --git a/python/testData/intentions/afterParamTypeInNumpyDocStringParamDeclaredColon.py b/python/testData/intentions/paramTypeInNumpyDocStringParamDeclaredColon_after.py similarity index 100% rename from python/testData/intentions/afterParamTypeInNumpyDocStringParamDeclaredColon.py rename to python/testData/intentions/paramTypeInNumpyDocStringParamDeclaredColon_after.py diff --git a/python/testData/intentions/beforeParamTypeInNumpyDocStringParamDeclaredNoColon.py b/python/testData/intentions/paramTypeInNumpyDocStringParamDeclaredNoColon.py similarity index 100% rename from python/testData/intentions/beforeParamTypeInNumpyDocStringParamDeclaredNoColon.py rename to python/testData/intentions/paramTypeInNumpyDocStringParamDeclaredNoColon.py diff --git a/python/testData/intentions/afterParamTypeInNumpyDocStringParamDeclaredNoColon.py b/python/testData/intentions/paramTypeInNumpyDocStringParamDeclaredNoColon_after.py similarity index 100% rename from python/testData/intentions/afterParamTypeInNumpyDocStringParamDeclaredNoColon.py rename to python/testData/intentions/paramTypeInNumpyDocStringParamDeclaredNoColon_after.py diff --git a/python/testData/intentions/beforePositionalVarargTypeInGoogleDocString.py b/python/testData/intentions/positionalVarargTypeInGoogleDocString.py similarity index 100% rename from python/testData/intentions/beforePositionalVarargTypeInGoogleDocString.py rename to python/testData/intentions/positionalVarargTypeInGoogleDocString.py diff --git a/python/testData/intentions/afterPositionalVarargTypeInGoogleDocString.py b/python/testData/intentions/positionalVarargTypeInGoogleDocString_after.py similarity index 100% rename from python/testData/intentions/afterPositionalVarargTypeInGoogleDocString.py rename to python/testData/intentions/positionalVarargTypeInGoogleDocString_after.py diff --git a/python/testData/intentions/beforeQuotedString.py b/python/testData/intentions/quotedString.py similarity index 100% rename from python/testData/intentions/beforeQuotedString.py rename to python/testData/intentions/quotedString.py diff --git a/python/testData/intentions/beforeQuotedStringDoubleSlash.py b/python/testData/intentions/quotedStringDoubleSlash.py similarity index 100% rename from python/testData/intentions/beforeQuotedStringDoubleSlash.py rename to python/testData/intentions/quotedStringDoubleSlash.py diff --git a/python/testData/intentions/afterQuotedStringDoubleSlash.py b/python/testData/intentions/quotedStringDoubleSlash_after.py similarity index 100% rename from python/testData/intentions/afterQuotedStringDoubleSlash.py rename to python/testData/intentions/quotedStringDoubleSlash_after.py diff --git a/python/testData/intentions/afterQuotedString.py b/python/testData/intentions/quotedString_after.py similarity index 100% rename from python/testData/intentions/afterQuotedString.py rename to python/testData/intentions/quotedString_after.py diff --git a/python/testData/intentions/beforeRemoveLeadingU.py b/python/testData/intentions/removeLeadingU.py similarity index 100% rename from python/testData/intentions/beforeRemoveLeadingU.py rename to python/testData/intentions/removeLeadingU.py diff --git a/python/testData/intentions/afterRemoveLeadingU.py b/python/testData/intentions/removeLeadingU_after.py similarity index 100% rename from python/testData/intentions/afterRemoveLeadingU.py rename to python/testData/intentions/removeLeadingU_after.py diff --git a/python/testData/intentions/beforeRemoveTrailingL.py b/python/testData/intentions/removeTrailingL.py similarity index 100% rename from python/testData/intentions/beforeRemoveTrailingL.py rename to python/testData/intentions/removeTrailingL.py diff --git a/python/testData/intentions/afterRemoveTrailingL.py b/python/testData/intentions/removeTrailingL_after.py similarity index 100% rename from python/testData/intentions/afterRemoveTrailingL.py rename to python/testData/intentions/removeTrailingL_after.py diff --git a/python/testData/intentions/beforeReplaceBackQuoteExpression.py b/python/testData/intentions/replaceBackQuoteExpression.py similarity index 100% rename from python/testData/intentions/beforeReplaceBackQuoteExpression.py rename to python/testData/intentions/replaceBackQuoteExpression.py diff --git a/python/testData/intentions/afterReplaceBackQuoteExpression.py b/python/testData/intentions/replaceBackQuoteExpression_after.py similarity index 100% rename from python/testData/intentions/afterReplaceBackQuoteExpression.py rename to python/testData/intentions/replaceBackQuoteExpression_after.py diff --git a/python/testData/intentions/beforeReplaceExceptPart.py b/python/testData/intentions/replaceExceptPart.py similarity index 100% rename from python/testData/intentions/beforeReplaceExceptPart.py rename to python/testData/intentions/replaceExceptPart.py diff --git a/python/testData/intentions/afterReplaceExceptPart.py b/python/testData/intentions/replaceExceptPart_after.py similarity index 100% rename from python/testData/intentions/afterReplaceExceptPart.py rename to python/testData/intentions/replaceExceptPart_after.py diff --git a/python/testData/intentions/beforeReplaceListComprehension2.py b/python/testData/intentions/replaceListComprehension2.py similarity index 100% rename from python/testData/intentions/beforeReplaceListComprehension2.py rename to python/testData/intentions/replaceListComprehension2.py diff --git a/python/testData/intentions/afterReplaceListComprehension2.py b/python/testData/intentions/replaceListComprehension2_after.py similarity index 100% rename from python/testData/intentions/afterReplaceListComprehension2.py rename to python/testData/intentions/replaceListComprehension2_after.py diff --git a/python/testData/intentions/beforeReplaceListComprehensionWithFor.py b/python/testData/intentions/replaceListComprehensionWithFor.py similarity index 100% rename from python/testData/intentions/beforeReplaceListComprehensionWithFor.py rename to python/testData/intentions/replaceListComprehensionWithFor.py diff --git a/python/testData/intentions/afterReplaceListComprehensionWithFor.py b/python/testData/intentions/replaceListComprehensionWithFor_after.py similarity index 100% rename from python/testData/intentions/afterReplaceListComprehensionWithFor.py rename to python/testData/intentions/replaceListComprehensionWithFor_after.py diff --git a/python/testData/intentions/beforeReplaceListComprehensions.py b/python/testData/intentions/replaceListComprehensions.py similarity index 100% rename from python/testData/intentions/beforeReplaceListComprehensions.py rename to python/testData/intentions/replaceListComprehensions.py diff --git a/python/testData/intentions/afterReplaceListComprehensions.py b/python/testData/intentions/replaceListComprehensions_after.py similarity index 100% rename from python/testData/intentions/afterReplaceListComprehensions.py rename to python/testData/intentions/replaceListComprehensions_after.py diff --git a/python/testData/intentions/beforeReplaceMethod.py b/python/testData/intentions/replaceMethod.py similarity index 100% rename from python/testData/intentions/beforeReplaceMethod.py rename to python/testData/intentions/replaceMethod.py diff --git a/python/testData/intentions/afterReplaceMethod.py b/python/testData/intentions/replaceMethod_after.py similarity index 100% rename from python/testData/intentions/afterReplaceMethod.py rename to python/testData/intentions/replaceMethod_after.py diff --git a/python/testData/intentions/beforeReplaceOctalNumericLiteral.py b/python/testData/intentions/replaceOctalNumericLiteral.py similarity index 100% rename from python/testData/intentions/beforeReplaceOctalNumericLiteral.py rename to python/testData/intentions/replaceOctalNumericLiteral.py diff --git a/python/testData/intentions/afterReplaceOctalNumericLiteral.py b/python/testData/intentions/replaceOctalNumericLiteral_after.py similarity index 100% rename from python/testData/intentions/afterReplaceOctalNumericLiteral.py rename to python/testData/intentions/replaceOctalNumericLiteral_after.py diff --git a/python/testData/intentions/beforeReplaceRaiseStatement.py b/python/testData/intentions/replaceRaiseStatement.py similarity index 100% rename from python/testData/intentions/beforeReplaceRaiseStatement.py rename to python/testData/intentions/replaceRaiseStatement.py diff --git a/python/testData/intentions/afterReplaceRaiseStatement.py b/python/testData/intentions/replaceRaiseStatement_after.py similarity index 100% rename from python/testData/intentions/afterReplaceRaiseStatement.py rename to python/testData/intentions/replaceRaiseStatement_after.py diff --git a/python/testData/intentions/beforeRestNoReturnTagForInit.py b/python/testData/intentions/restNoReturnTagForInit.py similarity index 100% rename from python/testData/intentions/beforeRestNoReturnTagForInit.py rename to python/testData/intentions/restNoReturnTagForInit.py diff --git a/python/testData/intentions/afterRestNoReturnTagForInit.py b/python/testData/intentions/restNoReturnTagForInit_after.py similarity index 100% rename from python/testData/intentions/afterRestNoReturnTagForInit.py rename to python/testData/intentions/restNoReturnTagForInit_after.py diff --git a/python/testData/intentions/beforeReturnTypeInDocStringDifferentIndentationSize.py b/python/testData/intentions/returnTypeInDocStringDifferentIndentationSize.py similarity index 100% rename from python/testData/intentions/beforeReturnTypeInDocStringDifferentIndentationSize.py rename to python/testData/intentions/returnTypeInDocStringDifferentIndentationSize.py diff --git a/python/testData/intentions/afterReturnTypeInDocStringDifferentIndentationSize.py b/python/testData/intentions/returnTypeInDocStringDifferentIndentationSize_after.py similarity index 100% rename from python/testData/intentions/afterReturnTypeInDocStringDifferentIndentationSize.py rename to python/testData/intentions/returnTypeInDocStringDifferentIndentationSize_after.py diff --git a/python/testData/intentions/beforeReturnTypeInDocstring.py b/python/testData/intentions/returnTypeInDocstring.py similarity index 100% rename from python/testData/intentions/beforeReturnTypeInDocstring.py rename to python/testData/intentions/returnTypeInDocstring.py diff --git a/python/testData/intentions/afterReturnTypeInDocstring.py b/python/testData/intentions/returnTypeInDocstring_after.py similarity index 100% rename from python/testData/intentions/afterReturnTypeInDocstring.py rename to python/testData/intentions/returnTypeInDocstring_after.py diff --git a/python/testData/intentions/beforeReturnTypeInEmptyGoogleDocString.py b/python/testData/intentions/returnTypeInEmptyGoogleDocString.py similarity index 100% rename from python/testData/intentions/beforeReturnTypeInEmptyGoogleDocString.py rename to python/testData/intentions/returnTypeInEmptyGoogleDocString.py diff --git a/python/testData/intentions/afterReturnTypeInEmptyGoogleDocString.py b/python/testData/intentions/returnTypeInEmptyGoogleDocString_after.py similarity index 100% rename from python/testData/intentions/afterReturnTypeInEmptyGoogleDocString.py rename to python/testData/intentions/returnTypeInEmptyGoogleDocString_after.py diff --git a/python/testData/intentions/beforeReturnTypeInEmptyNumpyDocString.py b/python/testData/intentions/returnTypeInEmptyNumpyDocString.py similarity index 100% rename from python/testData/intentions/beforeReturnTypeInEmptyNumpyDocString.py rename to python/testData/intentions/returnTypeInEmptyNumpyDocString.py diff --git a/python/testData/intentions/afterReturnTypeInEmptyNumpyDocString.py b/python/testData/intentions/returnTypeInEmptyNumpyDocString_after.py similarity index 100% rename from python/testData/intentions/afterReturnTypeInEmptyNumpyDocString.py rename to python/testData/intentions/returnTypeInEmptyNumpyDocString_after.py diff --git a/python/testData/intentions/beforeReturnTypeInGoogleDocStringEmptyReturnSection.py b/python/testData/intentions/returnTypeInGoogleDocStringEmptyReturnSection.py similarity index 100% rename from python/testData/intentions/beforeReturnTypeInGoogleDocStringEmptyReturnSection.py rename to python/testData/intentions/returnTypeInGoogleDocStringEmptyReturnSection.py diff --git a/python/testData/intentions/afterReturnTypeInGoogleDocStringEmptyReturnSection.py b/python/testData/intentions/returnTypeInGoogleDocStringEmptyReturnSection_after.py similarity index 100% rename from python/testData/intentions/afterReturnTypeInGoogleDocStringEmptyReturnSection.py rename to python/testData/intentions/returnTypeInGoogleDocStringEmptyReturnSection_after.py diff --git a/python/testData/intentions/beforeReturnTypeInNewGoogleDocString.py b/python/testData/intentions/returnTypeInNewGoogleDocString.py similarity index 100% rename from python/testData/intentions/beforeReturnTypeInNewGoogleDocString.py rename to python/testData/intentions/returnTypeInNewGoogleDocString.py diff --git a/python/testData/intentions/afterReturnTypeInNewGoogleDocString.py b/python/testData/intentions/returnTypeInNewGoogleDocString_after.py similarity index 100% rename from python/testData/intentions/afterReturnTypeInNewGoogleDocString.py rename to python/testData/intentions/returnTypeInNewGoogleDocString_after.py diff --git a/python/testData/intentions/beforeReturnTypeInNewNumpyDocString.py b/python/testData/intentions/returnTypeInNewNumpyDocString.py similarity index 100% rename from python/testData/intentions/beforeReturnTypeInNewNumpyDocString.py rename to python/testData/intentions/returnTypeInNewNumpyDocString.py diff --git a/python/testData/intentions/afterReturnTypeInNewNumpyDocString.py b/python/testData/intentions/returnTypeInNewNumpyDocString_after.py similarity index 100% rename from python/testData/intentions/afterReturnTypeInNewNumpyDocString.py rename to python/testData/intentions/returnTypeInNewNumpyDocString_after.py diff --git a/python/testData/intentions/beforeReturnTypeInNumpyDocStringEmptyReturnSection.py b/python/testData/intentions/returnTypeInNumpyDocStringEmptyReturnSection.py similarity index 100% rename from python/testData/intentions/beforeReturnTypeInNumpyDocStringEmptyReturnSection.py rename to python/testData/intentions/returnTypeInNumpyDocStringEmptyReturnSection.py diff --git a/python/testData/intentions/afterReturnTypeInNumpyDocStringEmptyReturnSection.py b/python/testData/intentions/returnTypeInNumpyDocStringEmptyReturnSection_after.py similarity index 100% rename from python/testData/intentions/afterReturnTypeInNumpyDocStringEmptyReturnSection.py rename to python/testData/intentions/returnTypeInNumpyDocStringEmptyReturnSection_after.py diff --git a/python/testData/intentions/beforeReturnTypeInPy3Annotation.py b/python/testData/intentions/returnTypeInPy3Annotation.py similarity index 100% rename from python/testData/intentions/beforeReturnTypeInPy3Annotation.py rename to python/testData/intentions/returnTypeInPy3Annotation.py diff --git a/python/testData/intentions/beforeReturnTypeInPy3Annotation1.py b/python/testData/intentions/returnTypeInPy3Annotation1.py similarity index 100% rename from python/testData/intentions/beforeReturnTypeInPy3Annotation1.py rename to python/testData/intentions/returnTypeInPy3Annotation1.py diff --git a/python/testData/intentions/afterReturnTypeInPy3Annotation1.py b/python/testData/intentions/returnTypeInPy3Annotation1_after.py similarity index 100% rename from python/testData/intentions/afterReturnTypeInPy3Annotation1.py rename to python/testData/intentions/returnTypeInPy3Annotation1_after.py diff --git a/python/testData/intentions/beforeReturnTypeInPy3Annotation2.py b/python/testData/intentions/returnTypeInPy3Annotation2.py similarity index 100% rename from python/testData/intentions/beforeReturnTypeInPy3Annotation2.py rename to python/testData/intentions/returnTypeInPy3Annotation2.py diff --git a/python/testData/intentions/afterReturnTypeInPy3Annotation2.py b/python/testData/intentions/returnTypeInPy3Annotation2_after.py similarity index 100% rename from python/testData/intentions/afterReturnTypeInPy3Annotation2.py rename to python/testData/intentions/returnTypeInPy3Annotation2_after.py diff --git a/python/testData/intentions/beforeReturnTypeInPy3AnnotationLocalFunction.py b/python/testData/intentions/returnTypeInPy3AnnotationLocalFunction.py similarity index 100% rename from python/testData/intentions/beforeReturnTypeInPy3AnnotationLocalFunction.py rename to python/testData/intentions/returnTypeInPy3AnnotationLocalFunction.py diff --git a/python/testData/intentions/afterReturnTypeInPy3AnnotationLocalFunction.py b/python/testData/intentions/returnTypeInPy3AnnotationLocalFunction_after.py similarity index 100% rename from python/testData/intentions/afterReturnTypeInPy3AnnotationLocalFunction.py rename to python/testData/intentions/returnTypeInPy3AnnotationLocalFunction_after.py diff --git a/python/testData/intentions/beforeReturnTypeInPy3AnnotationNoColon.py b/python/testData/intentions/returnTypeInPy3AnnotationNoColon.py similarity index 100% rename from python/testData/intentions/beforeReturnTypeInPy3AnnotationNoColon.py rename to python/testData/intentions/returnTypeInPy3AnnotationNoColon.py diff --git a/python/testData/intentions/afterReturnTypeInPy3AnnotationNoColon.py b/python/testData/intentions/returnTypeInPy3AnnotationNoColon_after.py similarity index 100% rename from python/testData/intentions/afterReturnTypeInPy3AnnotationNoColon.py rename to python/testData/intentions/returnTypeInPy3AnnotationNoColon_after.py diff --git a/python/testData/intentions/afterReturnTypeInPy3Annotation.py b/python/testData/intentions/returnTypeInPy3Annotation_after.py similarity index 100% rename from python/testData/intentions/afterReturnTypeInPy3Annotation.py rename to python/testData/intentions/returnTypeInPy3Annotation_after.py diff --git a/python/testData/intentions/beforeSplitIf.py b/python/testData/intentions/splitIf.py similarity index 100% rename from python/testData/intentions/beforeSplitIf.py rename to python/testData/intentions/splitIf.py diff --git a/python/testData/intentions/afterSplitIf.py b/python/testData/intentions/splitIf_after.py similarity index 100% rename from python/testData/intentions/afterSplitIf.py rename to python/testData/intentions/splitIf_after.py diff --git a/python/testData/intentions/beforeTransformConditionalExpression.py b/python/testData/intentions/transformConditionalExpression.py similarity index 100% rename from python/testData/intentions/beforeTransformConditionalExpression.py rename to python/testData/intentions/transformConditionalExpression.py diff --git a/python/testData/intentions/afterTransformConditionalExpression.py b/python/testData/intentions/transformConditionalExpression_after.py similarity index 100% rename from python/testData/intentions/afterTransformConditionalExpression.py rename to python/testData/intentions/transformConditionalExpression_after.py diff --git a/python/testData/intentions/transformTestData.sh b/python/testData/intentions/transformTestData.sh new file mode 100755 index 000000000000..867824cd13ea --- /dev/null +++ b/python/testData/intentions/transformTestData.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash +set -x + +TEST_DATA_ROOT="${1:-$(pwd)}" +cd "$TEST_DATA_ROOT" + +for name in $(ls); do + if [[ -f "$name" ]]; then + if [[ "$name" =~ ^before.*\.py ]]; then + withoutPrefix="${name#before}" + git mv "$name" "${withoutPrefix,}" + fi + if [[ "$name" =~ ^after.*\.py ]]; then + testName="${name%.py}" + withoutPrefix="${testName#after}_after.py" + git mv "$name" "${withoutPrefix,}" + fi + fi +done diff --git a/python/testData/intentions/beforeTypeAnnotation3.py b/python/testData/intentions/typeAnnotation3.py similarity index 100% rename from python/testData/intentions/beforeTypeAnnotation3.py rename to python/testData/intentions/typeAnnotation3.py diff --git a/python/testData/intentions/afterTypeAnnotation3.py b/python/testData/intentions/typeAnnotation3_after.py similarity index 100% rename from python/testData/intentions/afterTypeAnnotation3.py rename to python/testData/intentions/typeAnnotation3_after.py diff --git a/python/testData/intentions/beforeTypeAssertion.py b/python/testData/intentions/typeAssertion.py similarity index 100% rename from python/testData/intentions/beforeTypeAssertion.py rename to python/testData/intentions/typeAssertion.py diff --git a/python/testData/intentions/beforeTypeAssertion1.py b/python/testData/intentions/typeAssertion1.py similarity index 100% rename from python/testData/intentions/beforeTypeAssertion1.py rename to python/testData/intentions/typeAssertion1.py diff --git a/python/testData/intentions/afterTypeAssertion1.py b/python/testData/intentions/typeAssertion1_after.py similarity index 100% rename from python/testData/intentions/afterTypeAssertion1.py rename to python/testData/intentions/typeAssertion1_after.py diff --git a/python/testData/intentions/beforeTypeAssertion2.py b/python/testData/intentions/typeAssertion2.py similarity index 100% rename from python/testData/intentions/beforeTypeAssertion2.py rename to python/testData/intentions/typeAssertion2.py diff --git a/python/testData/intentions/afterTypeAssertion2.py b/python/testData/intentions/typeAssertion2_after.py similarity index 100% rename from python/testData/intentions/afterTypeAssertion2.py rename to python/testData/intentions/typeAssertion2_after.py diff --git a/python/testData/intentions/beforeTypeAssertion3.py b/python/testData/intentions/typeAssertion3.py similarity index 100% rename from python/testData/intentions/beforeTypeAssertion3.py rename to python/testData/intentions/typeAssertion3.py diff --git a/python/testData/intentions/beforeTypeAssertion4.py b/python/testData/intentions/typeAssertion4.py similarity index 100% rename from python/testData/intentions/beforeTypeAssertion4.py rename to python/testData/intentions/typeAssertion4.py diff --git a/python/testData/intentions/afterTypeAssertion4.py b/python/testData/intentions/typeAssertion4_after.py similarity index 100% rename from python/testData/intentions/afterTypeAssertion4.py rename to python/testData/intentions/typeAssertion4_after.py diff --git a/python/testData/intentions/beforeTypeAssertionInDictComp.py b/python/testData/intentions/typeAssertionInDictComp.py similarity index 100% rename from python/testData/intentions/beforeTypeAssertionInDictComp.py rename to python/testData/intentions/typeAssertionInDictComp.py diff --git a/python/testData/intentions/afterTypeAssertion.py b/python/testData/intentions/typeAssertion_after.py similarity index 100% rename from python/testData/intentions/afterTypeAssertion.py rename to python/testData/intentions/typeAssertion_after.py diff --git a/python/testData/intentions/beforeTypeInDocStringDifferentIndentationSize.py b/python/testData/intentions/typeInDocStringDifferentIndentationSize.py similarity index 100% rename from python/testData/intentions/beforeTypeInDocStringDifferentIndentationSize.py rename to python/testData/intentions/typeInDocStringDifferentIndentationSize.py diff --git a/python/testData/intentions/afterTypeInDocStringDifferentIndentationSize.py b/python/testData/intentions/typeInDocStringDifferentIndentationSize_after.py similarity index 100% rename from python/testData/intentions/afterTypeInDocStringDifferentIndentationSize.py rename to python/testData/intentions/typeInDocStringDifferentIndentationSize_after.py diff --git a/python/testData/intentions/beforeTypeInDocstring.py b/python/testData/intentions/typeInDocstring.py similarity index 100% rename from python/testData/intentions/beforeTypeInDocstring.py rename to python/testData/intentions/typeInDocstring.py diff --git a/python/testData/intentions/beforeTypeInDocstring1.py b/python/testData/intentions/typeInDocstring1.py similarity index 100% rename from python/testData/intentions/beforeTypeInDocstring1.py rename to python/testData/intentions/typeInDocstring1.py diff --git a/python/testData/intentions/afterTypeInDocstring1.py b/python/testData/intentions/typeInDocstring1_after.py similarity index 100% rename from python/testData/intentions/afterTypeInDocstring1.py rename to python/testData/intentions/typeInDocstring1_after.py diff --git a/python/testData/intentions/beforeTypeInDocstring2.py b/python/testData/intentions/typeInDocstring2.py similarity index 100% rename from python/testData/intentions/beforeTypeInDocstring2.py rename to python/testData/intentions/typeInDocstring2.py diff --git a/python/testData/intentions/afterTypeInDocstring2.py b/python/testData/intentions/typeInDocstring2_after.py similarity index 100% rename from python/testData/intentions/afterTypeInDocstring2.py rename to python/testData/intentions/typeInDocstring2_after.py diff --git a/python/testData/intentions/beforeTypeInDocstring3.py b/python/testData/intentions/typeInDocstring3.py similarity index 100% rename from python/testData/intentions/beforeTypeInDocstring3.py rename to python/testData/intentions/typeInDocstring3.py diff --git a/python/testData/intentions/afterTypeInDocstring3.py b/python/testData/intentions/typeInDocstring3_after.py similarity index 100% rename from python/testData/intentions/afterTypeInDocstring3.py rename to python/testData/intentions/typeInDocstring3_after.py diff --git a/python/testData/intentions/beforeTypeInDocstring4.py b/python/testData/intentions/typeInDocstring4.py similarity index 100% rename from python/testData/intentions/beforeTypeInDocstring4.py rename to python/testData/intentions/typeInDocstring4.py diff --git a/python/testData/intentions/afterTypeInDocstring4.py b/python/testData/intentions/typeInDocstring4_after.py similarity index 100% rename from python/testData/intentions/afterTypeInDocstring4.py rename to python/testData/intentions/typeInDocstring4_after.py diff --git a/python/testData/intentions/beforeTypeInDocstring5.py b/python/testData/intentions/typeInDocstring5.py similarity index 100% rename from python/testData/intentions/beforeTypeInDocstring5.py rename to python/testData/intentions/typeInDocstring5.py diff --git a/python/testData/intentions/afterTypeInDocstring5.py b/python/testData/intentions/typeInDocstring5_after.py similarity index 100% rename from python/testData/intentions/afterTypeInDocstring5.py rename to python/testData/intentions/typeInDocstring5_after.py diff --git a/python/testData/intentions/afterTypeInDocstring6.py b/python/testData/intentions/typeInDocstring6.py similarity index 100% rename from python/testData/intentions/afterTypeInDocstring6.py rename to python/testData/intentions/typeInDocstring6.py diff --git a/python/testData/intentions/beforeTypeInDocstring6.py b/python/testData/intentions/typeInDocstring6_after.py similarity index 100% rename from python/testData/intentions/beforeTypeInDocstring6.py rename to python/testData/intentions/typeInDocstring6_after.py diff --git a/python/testData/intentions/beforeTypeInDocstring7.py b/python/testData/intentions/typeInDocstring7.py similarity index 100% rename from python/testData/intentions/beforeTypeInDocstring7.py rename to python/testData/intentions/typeInDocstring7.py diff --git a/python/testData/intentions/afterTypeInDocstring7.py b/python/testData/intentions/typeInDocstring7_after.py similarity index 100% rename from python/testData/intentions/afterTypeInDocstring7.py rename to python/testData/intentions/typeInDocstring7_after.py diff --git a/python/testData/intentions/beforeTypeInDocstringAtTheEndOfFunction.py b/python/testData/intentions/typeInDocstringAtTheEndOfFunction.py similarity index 100% rename from python/testData/intentions/beforeTypeInDocstringAtTheEndOfFunction.py rename to python/testData/intentions/typeInDocstringAtTheEndOfFunction.py diff --git a/python/testData/intentions/afterTypeInDocstringAtTheEndOfFunction.py b/python/testData/intentions/typeInDocstringAtTheEndOfFunction_after.py similarity index 100% rename from python/testData/intentions/afterTypeInDocstringAtTheEndOfFunction.py rename to python/testData/intentions/typeInDocstringAtTheEndOfFunction_after.py diff --git a/python/testData/intentions/beforeTypeInDocstringParameterInCallable.py b/python/testData/intentions/typeInDocstringParameterInCallable.py similarity index 100% rename from python/testData/intentions/beforeTypeInDocstringParameterInCallable.py rename to python/testData/intentions/typeInDocstringParameterInCallable.py diff --git a/python/testData/intentions/afterTypeInDocstringParameterInCallable.py b/python/testData/intentions/typeInDocstringParameterInCallable_after.py similarity index 100% rename from python/testData/intentions/afterTypeInDocstringParameterInCallable.py rename to python/testData/intentions/typeInDocstringParameterInCallable_after.py diff --git a/python/testData/intentions/afterTypeInDocstring.py b/python/testData/intentions/typeInDocstring_after.py similarity index 100% rename from python/testData/intentions/afterTypeInDocstring.py rename to python/testData/intentions/typeInDocstring_after.py diff --git a/python/testData/intentions/beforeTypeInPy3Annotation.py b/python/testData/intentions/typeInPy3Annotation.py similarity index 100% rename from python/testData/intentions/beforeTypeInPy3Annotation.py rename to python/testData/intentions/typeInPy3Annotation.py diff --git a/python/testData/intentions/afterTypeInPy3Annotation.py b/python/testData/intentions/typeInPy3Annotation_after.py similarity index 100% rename from python/testData/intentions/afterTypeInPy3Annotation.py rename to python/testData/intentions/typeInPy3Annotation_after.py diff --git a/python/testData/intentions/beforeYieldFrom.py b/python/testData/intentions/yieldFrom.py similarity index 100% rename from python/testData/intentions/beforeYieldFrom.py rename to python/testData/intentions/yieldFrom.py diff --git a/python/testData/intentions/afterYieldFrom.py b/python/testData/intentions/yieldFrom_after.py similarity index 100% rename from python/testData/intentions/afterYieldFrom.py rename to python/testData/intentions/yieldFrom_after.py diff --git a/python/testSrc/com/jetbrains/python/intentions/PyIntentionTest.java b/python/testSrc/com/jetbrains/python/intentions/PyIntentionTest.java index d200f8b5b43c..c6ff7f7fbd52 100644 --- a/python/testSrc/com/jetbrains/python/intentions/PyIntentionTest.java +++ b/python/testSrc/com/jetbrains/python/intentions/PyIntentionTest.java @@ -51,10 +51,10 @@ public class PyIntentionTest extends PyTestCase { } private void doTest(String hint) { - myFixture.configureByFile("intentions/before" + getTestName(false) + ".py"); + myFixture.configureByFile("intentions/" + getTestName(true) + ".py"); final IntentionAction action = myFixture.findSingleIntention(hint); myFixture.launchAction(action); - myFixture.checkResultByFile("intentions/after" + getTestName(false) + ".py"); + myFixture.checkResultByFile("intentions/" + getTestName(true) + "_after.py"); } private void doTest(String hint, LanguageLevel languageLevel) { @@ -68,10 +68,10 @@ public class PyIntentionTest extends PyTestCase { } private void doTest(String hint, boolean ignoreWhiteSpaces) { - myFixture.configureByFile("intentions/before" + getTestName(false) + ".py"); + myFixture.configureByFile("intentions/" + getTestName(true) + ".py"); final IntentionAction action = myFixture.findSingleIntention(hint); myFixture.launchAction(action); - myFixture.checkResultByFile("intentions/after" + getTestName(false) + ".py", ignoreWhiteSpaces); + myFixture.checkResultByFile("intentions/" + getTestName(true) + "_after.py", ignoreWhiteSpaces); } /** @@ -80,7 +80,7 @@ public class PyIntentionTest extends PyTestCase { * @param hint */ private void doNegativeTest(String hint) { - myFixture.configureByFile("intentions/before" + getTestName(false) + ".py"); + myFixture.configureByFile("intentions/" + getTestName(true) + ".py"); List ints = myFixture.filterAvailableIntentions(hint); assertEmpty(ints); } @@ -179,22 +179,16 @@ public class PyIntentionTest extends PyTestCase { doTest(PyBundle.message("INTN.convert.dict.literal.to.dict.constructor")); } - public void testDictLiteralFormToConstructor1() { //PY-2873 - myFixture.configureByFile("intentions/beforeDictLiteralFormToConstructor1" + ".py"); - final IntentionAction action = myFixture.getAvailableIntention(PyBundle.message("INTN.convert.dict.literal.to.dict.constructor")); - assertNull(action); + public void testDictLiteralFormToConstructor1() { + doNegativeTest(PyBundle.message("INTN.convert.dict.literal.to.dict.constructor")); } public void testDictLiteralFormToConstructor2() { //PY-5157 - myFixture.configureByFile("intentions/beforeDictLiteralFormToConstructor2" + ".py"); - final IntentionAction action = myFixture.getAvailableIntention(PyBundle.message("INTN.convert.dict.literal.to.dict.constructor")); - assertNull(action); + doNegativeTest(PyBundle.message("INTN.convert.dict.literal.to.dict.constructor")); } public void testDictLiteralFormToConstructor3() { - myFixture.configureByFile("intentions/beforeDictLiteralFormToConstructor3" + ".py"); - final IntentionAction action = myFixture.getAvailableIntention(PyBundle.message("INTN.convert.dict.literal.to.dict.constructor")); - assertNull(action); + doNegativeTest(PyBundle.message("INTN.convert.dict.literal.to.dict.constructor")); } public void testQuotedString() { //PY-2915