diff --git a/python/testData/codeInsight/controlflow/andbooleanexpression.py b/python/testData/codeInsight/controlflow/AndBooleanExpression.py similarity index 100% rename from python/testData/codeInsight/controlflow/andbooleanexpression.py rename to python/testData/codeInsight/controlflow/AndBooleanExpression.py diff --git a/python/testData/codeInsight/controlflow/andbooleanexpression.txt b/python/testData/codeInsight/controlflow/AndBooleanExpression.txt similarity index 100% rename from python/testData/codeInsight/controlflow/andbooleanexpression.txt rename to python/testData/codeInsight/controlflow/AndBooleanExpression.txt diff --git a/python/testData/codeInsight/controlflow/assert.py b/python/testData/codeInsight/controlflow/Assert.py similarity index 100% rename from python/testData/codeInsight/controlflow/assert.py rename to python/testData/codeInsight/controlflow/Assert.py diff --git a/python/testData/codeInsight/controlflow/assert.txt b/python/testData/codeInsight/controlflow/Assert.txt similarity index 100% rename from python/testData/codeInsight/controlflow/assert.txt rename to python/testData/codeInsight/controlflow/Assert.txt diff --git a/python/testData/codeInsight/controlflow/assertfalse.py b/python/testData/codeInsight/controlflow/AssertFalse.py similarity index 100% rename from python/testData/codeInsight/controlflow/assertfalse.py rename to python/testData/codeInsight/controlflow/AssertFalse.py diff --git a/python/testData/codeInsight/controlflow/assertfalse.txt b/python/testData/codeInsight/controlflow/AssertFalse.txt similarity index 100% rename from python/testData/codeInsight/controlflow/assertfalse.txt rename to python/testData/codeInsight/controlflow/AssertFalse.txt diff --git a/python/testData/codeInsight/controlflow/assertfalseargument.py b/python/testData/codeInsight/controlflow/AssertFalseArgument.py similarity index 100% rename from python/testData/codeInsight/controlflow/assertfalseargument.py rename to python/testData/codeInsight/controlflow/AssertFalseArgument.py diff --git a/python/testData/codeInsight/controlflow/assertfalseargument.txt b/python/testData/codeInsight/controlflow/AssertFalseArgument.txt similarity index 100% rename from python/testData/codeInsight/controlflow/assertfalseargument.txt rename to python/testData/codeInsight/controlflow/AssertFalseArgument.txt diff --git a/python/testData/codeInsight/controlflow/assignment.py b/python/testData/codeInsight/controlflow/Assignment.py similarity index 100% rename from python/testData/codeInsight/controlflow/assignment.py rename to python/testData/codeInsight/controlflow/Assignment.py diff --git a/python/testData/codeInsight/controlflow/assignment.txt b/python/testData/codeInsight/controlflow/Assignment.txt similarity index 100% rename from python/testData/codeInsight/controlflow/assignment.txt rename to python/testData/codeInsight/controlflow/Assignment.txt diff --git a/python/testData/codeInsight/controlflow/assignment2.py b/python/testData/codeInsight/controlflow/Assignment2.py similarity index 100% rename from python/testData/codeInsight/controlflow/assignment2.py rename to python/testData/codeInsight/controlflow/Assignment2.py diff --git a/python/testData/codeInsight/controlflow/assignment2.txt b/python/testData/codeInsight/controlflow/Assignment2.txt similarity index 100% rename from python/testData/codeInsight/controlflow/assignment2.txt rename to python/testData/codeInsight/controlflow/Assignment2.txt diff --git a/python/testData/codeInsight/controlflow/assignmentexpression.py b/python/testData/codeInsight/controlflow/AssignmentExpression.py similarity index 100% rename from python/testData/codeInsight/controlflow/assignmentexpression.py rename to python/testData/codeInsight/controlflow/AssignmentExpression.py diff --git a/python/testData/codeInsight/controlflow/assignmentexpression.txt b/python/testData/codeInsight/controlflow/AssignmentExpression.txt similarity index 100% rename from python/testData/codeInsight/controlflow/assignmentexpression.txt rename to python/testData/codeInsight/controlflow/AssignmentExpression.txt diff --git a/python/testData/codeInsight/controlflow/assignmentexpressioninsidebinaryinwhile.py b/python/testData/codeInsight/controlflow/AssignmentExpressionInsideBinaryInWhile.py similarity index 100% rename from python/testData/codeInsight/controlflow/assignmentexpressioninsidebinaryinwhile.py rename to python/testData/codeInsight/controlflow/AssignmentExpressionInsideBinaryInWhile.py diff --git a/python/testData/codeInsight/controlflow/assignmentexpressioninsidebinaryinwhile.txt b/python/testData/codeInsight/controlflow/AssignmentExpressionInsideBinaryInWhile.txt similarity index 100% rename from python/testData/codeInsight/controlflow/assignmentexpressioninsidebinaryinwhile.txt rename to python/testData/codeInsight/controlflow/AssignmentExpressionInsideBinaryInWhile.txt diff --git a/python/testData/codeInsight/controlflow/assignmentexpressioninsidebinaryinwhileelse.py b/python/testData/codeInsight/controlflow/AssignmentExpressionInsideBinaryInWhileElse.py similarity index 100% rename from python/testData/codeInsight/controlflow/assignmentexpressioninsidebinaryinwhileelse.py rename to python/testData/codeInsight/controlflow/AssignmentExpressionInsideBinaryInWhileElse.py diff --git a/python/testData/codeInsight/controlflow/assignmentexpressioninsidebinaryinwhileelse.txt b/python/testData/codeInsight/controlflow/AssignmentExpressionInsideBinaryInWhileElse.txt similarity index 100% rename from python/testData/codeInsight/controlflow/assignmentexpressioninsidebinaryinwhileelse.txt rename to python/testData/codeInsight/controlflow/AssignmentExpressionInsideBinaryInWhileElse.txt diff --git a/python/testData/codeInsight/controlflow/augassignment.py b/python/testData/codeInsight/controlflow/AugAssignment.py similarity index 100% rename from python/testData/codeInsight/controlflow/augassignment.py rename to python/testData/codeInsight/controlflow/AugAssignment.py diff --git a/python/testData/codeInsight/controlflow/augassignment.txt b/python/testData/codeInsight/controlflow/AugAssignment.txt similarity index 100% rename from python/testData/codeInsight/controlflow/augassignment.txt rename to python/testData/codeInsight/controlflow/AugAssignment.txt diff --git a/python/testData/codeInsight/controlflow/break.py b/python/testData/codeInsight/controlflow/Break.py similarity index 100% rename from python/testData/codeInsight/controlflow/break.py rename to python/testData/codeInsight/controlflow/Break.py diff --git a/python/testData/codeInsight/controlflow/break.txt b/python/testData/codeInsight/controlflow/Break.txt similarity index 100% rename from python/testData/codeInsight/controlflow/break.txt rename to python/testData/codeInsight/controlflow/Break.txt diff --git a/python/testData/codeInsight/controlflow/conditionalexpression.py b/python/testData/codeInsight/controlflow/ConditionalExpression.py similarity index 100% rename from python/testData/codeInsight/controlflow/conditionalexpression.py rename to python/testData/codeInsight/controlflow/ConditionalExpression.py diff --git a/python/testData/codeInsight/controlflow/conditionalexpression.txt b/python/testData/codeInsight/controlflow/ConditionalExpression.txt similarity index 100% rename from python/testData/codeInsight/controlflow/conditionalexpression.txt rename to python/testData/codeInsight/controlflow/ConditionalExpression.txt diff --git a/python/testData/codeInsight/controlflow/continue.py b/python/testData/codeInsight/controlflow/Continue.py similarity index 100% rename from python/testData/codeInsight/controlflow/continue.py rename to python/testData/codeInsight/controlflow/Continue.py diff --git a/python/testData/codeInsight/controlflow/continue.txt b/python/testData/codeInsight/controlflow/Continue.txt similarity index 100% rename from python/testData/codeInsight/controlflow/continue.txt rename to python/testData/codeInsight/controlflow/Continue.txt diff --git a/python/testData/codeInsight/controlflow/continueinpositiveiteration.py b/python/testData/codeInsight/controlflow/ContinueInPositiveIteration.py similarity index 100% rename from python/testData/codeInsight/controlflow/continueinpositiveiteration.py rename to python/testData/codeInsight/controlflow/ContinueInPositiveIteration.py diff --git a/python/testData/codeInsight/controlflow/continueinpositiveiteration.txt b/python/testData/codeInsight/controlflow/ContinueInPositiveIteration.txt similarity index 100% rename from python/testData/codeInsight/controlflow/continueinpositiveiteration.txt rename to python/testData/codeInsight/controlflow/ContinueInPositiveIteration.txt diff --git a/python/testData/codeInsight/controlflow/decorator.py b/python/testData/codeInsight/controlflow/Decorator.py similarity index 100% rename from python/testData/codeInsight/controlflow/decorator.py rename to python/testData/codeInsight/controlflow/Decorator.py diff --git a/python/testData/codeInsight/controlflow/decorator.txt b/python/testData/codeInsight/controlflow/Decorator.txt similarity index 100% rename from python/testData/codeInsight/controlflow/decorator.txt rename to python/testData/codeInsight/controlflow/Decorator.txt diff --git a/python/testData/codeInsight/controlflow/defaultparametervalue.py b/python/testData/codeInsight/controlflow/DefaultParameterValue.py similarity index 100% rename from python/testData/codeInsight/controlflow/defaultparametervalue.py rename to python/testData/codeInsight/controlflow/DefaultParameterValue.py diff --git a/python/testData/codeInsight/controlflow/defaultparametervalue.txt b/python/testData/codeInsight/controlflow/DefaultParameterValue.txt similarity index 100% rename from python/testData/codeInsight/controlflow/defaultparametervalue.txt rename to python/testData/codeInsight/controlflow/DefaultParameterValue.txt diff --git a/python/testData/codeInsight/controlflow/delete.py b/python/testData/codeInsight/controlflow/Delete.py similarity index 100% rename from python/testData/codeInsight/controlflow/delete.py rename to python/testData/codeInsight/controlflow/Delete.py diff --git a/python/testData/codeInsight/controlflow/delete.txt b/python/testData/codeInsight/controlflow/Delete.txt similarity index 100% rename from python/testData/codeInsight/controlflow/delete.txt rename to python/testData/codeInsight/controlflow/Delete.txt diff --git a/python/testData/codeInsight/controlflow/deletesubscriptionandslice.py b/python/testData/codeInsight/controlflow/DeleteSubscriptionAndSlice.py similarity index 100% rename from python/testData/codeInsight/controlflow/deletesubscriptionandslice.py rename to python/testData/codeInsight/controlflow/DeleteSubscriptionAndSlice.py diff --git a/python/testData/codeInsight/controlflow/deletesubscriptionandslice.txt b/python/testData/codeInsight/controlflow/DeleteSubscriptionAndSlice.txt similarity index 100% rename from python/testData/codeInsight/controlflow/deletesubscriptionandslice.txt rename to python/testData/codeInsight/controlflow/DeleteSubscriptionAndSlice.txt diff --git a/python/testData/codeInsight/controlflow/doubletry.py b/python/testData/codeInsight/controlflow/DoubleTry.py similarity index 100% rename from python/testData/codeInsight/controlflow/doubletry.py rename to python/testData/codeInsight/controlflow/DoubleTry.py diff --git a/python/testData/codeInsight/controlflow/doubletry.txt b/python/testData/codeInsight/controlflow/DoubleTry.txt similarity index 100% rename from python/testData/codeInsight/controlflow/doubletry.txt rename to python/testData/codeInsight/controlflow/DoubleTry.txt diff --git a/python/testData/codeInsight/controlflow/file.py b/python/testData/codeInsight/controlflow/File.py similarity index 100% rename from python/testData/codeInsight/controlflow/file.py rename to python/testData/codeInsight/controlflow/File.py diff --git a/python/testData/codeInsight/controlflow/file.txt b/python/testData/codeInsight/controlflow/File.txt similarity index 100% rename from python/testData/codeInsight/controlflow/file.txt rename to python/testData/codeInsight/controlflow/File.txt diff --git a/python/testData/codeInsight/controlflow/for.py b/python/testData/codeInsight/controlflow/For.py similarity index 100% rename from python/testData/codeInsight/controlflow/for.py rename to python/testData/codeInsight/controlflow/For.py diff --git a/python/testData/codeInsight/controlflow/for.txt b/python/testData/codeInsight/controlflow/For.txt similarity index 100% rename from python/testData/codeInsight/controlflow/for.txt rename to python/testData/codeInsight/controlflow/For.txt diff --git a/python/testData/codeInsight/controlflow/forif.py b/python/testData/codeInsight/controlflow/ForIf.py similarity index 100% rename from python/testData/codeInsight/controlflow/forif.py rename to python/testData/codeInsight/controlflow/ForIf.py diff --git a/python/testData/codeInsight/controlflow/forif.txt b/python/testData/codeInsight/controlflow/ForIf.txt similarity index 100% rename from python/testData/codeInsight/controlflow/forif.txt rename to python/testData/codeInsight/controlflow/ForIf.txt diff --git a/python/testData/codeInsight/controlflow/forreturn.py b/python/testData/codeInsight/controlflow/ForReturn.py similarity index 100% rename from python/testData/codeInsight/controlflow/forreturn.py rename to python/testData/codeInsight/controlflow/ForReturn.py diff --git a/python/testData/codeInsight/controlflow/forreturn.txt b/python/testData/codeInsight/controlflow/ForReturn.txt similarity index 100% rename from python/testData/codeInsight/controlflow/forreturn.txt rename to python/testData/codeInsight/controlflow/ForReturn.txt diff --git a/python/testData/codeInsight/controlflow/fortrycontinue.py b/python/testData/codeInsight/controlflow/ForTryContinue.py similarity index 100% rename from python/testData/codeInsight/controlflow/fortrycontinue.py rename to python/testData/codeInsight/controlflow/ForTryContinue.py diff --git a/python/testData/codeInsight/controlflow/fortrycontinue.txt b/python/testData/codeInsight/controlflow/ForTryContinue.txt similarity index 100% rename from python/testData/codeInsight/controlflow/fortrycontinue.txt rename to python/testData/codeInsight/controlflow/ForTryContinue.txt diff --git a/python/testData/codeInsight/controlflow/function.py b/python/testData/codeInsight/controlflow/Function.py similarity index 100% rename from python/testData/codeInsight/controlflow/function.py rename to python/testData/codeInsight/controlflow/Function.py diff --git a/python/testData/codeInsight/controlflow/function.txt b/python/testData/codeInsight/controlflow/Function.txt similarity index 100% rename from python/testData/codeInsight/controlflow/function.txt rename to python/testData/codeInsight/controlflow/Function.txt diff --git a/python/testData/codeInsight/controlflow/if.py b/python/testData/codeInsight/controlflow/If.py similarity index 100% rename from python/testData/codeInsight/controlflow/if.py rename to python/testData/codeInsight/controlflow/If.py diff --git a/python/testData/codeInsight/controlflow/if.txt b/python/testData/codeInsight/controlflow/If.txt similarity index 100% rename from python/testData/codeInsight/controlflow/if.txt rename to python/testData/codeInsight/controlflow/If.txt diff --git a/python/testData/codeInsight/controlflow/ifeliffalse.py b/python/testData/codeInsight/controlflow/IfElifFalse.py similarity index 100% rename from python/testData/codeInsight/controlflow/ifeliffalse.py rename to python/testData/codeInsight/controlflow/IfElifFalse.py diff --git a/python/testData/codeInsight/controlflow/ifeliffalse.txt b/python/testData/codeInsight/controlflow/IfElifFalse.txt similarity index 100% rename from python/testData/codeInsight/controlflow/ifeliffalse.txt rename to python/testData/codeInsight/controlflow/IfElifFalse.txt diff --git a/python/testData/codeInsight/controlflow/ifeliftrue.py b/python/testData/codeInsight/controlflow/IfElifTrue.py similarity index 100% rename from python/testData/codeInsight/controlflow/ifeliftrue.py rename to python/testData/codeInsight/controlflow/IfElifTrue.py diff --git a/python/testData/codeInsight/controlflow/ifeliftrue.txt b/python/testData/codeInsight/controlflow/IfElifTrue.txt similarity index 100% rename from python/testData/codeInsight/controlflow/ifeliftrue.txt rename to python/testData/codeInsight/controlflow/IfElifTrue.txt diff --git a/python/testData/codeInsight/controlflow/ifelsereturn.py b/python/testData/codeInsight/controlflow/IfElseReturn.py similarity index 100% rename from python/testData/codeInsight/controlflow/ifelsereturn.py rename to python/testData/codeInsight/controlflow/IfElseReturn.py diff --git a/python/testData/codeInsight/controlflow/ifelsereturn.txt b/python/testData/codeInsight/controlflow/IfElseReturn.txt similarity index 100% rename from python/testData/codeInsight/controlflow/ifelsereturn.txt rename to python/testData/codeInsight/controlflow/IfElseReturn.txt diff --git a/python/testData/codeInsight/controlflow/iffalse.py b/python/testData/codeInsight/controlflow/IfFalse.py similarity index 100% rename from python/testData/codeInsight/controlflow/iffalse.py rename to python/testData/codeInsight/controlflow/IfFalse.py diff --git a/python/testData/codeInsight/controlflow/iffalse.txt b/python/testData/codeInsight/controlflow/IfFalse.txt similarity index 100% rename from python/testData/codeInsight/controlflow/iffalse.txt rename to python/testData/codeInsight/controlflow/IfFalse.txt diff --git a/python/testData/codeInsight/controlflow/iftrue.py b/python/testData/codeInsight/controlflow/IfTrue.py similarity index 100% rename from python/testData/codeInsight/controlflow/iftrue.py rename to python/testData/codeInsight/controlflow/IfTrue.py diff --git a/python/testData/codeInsight/controlflow/iftrue.txt b/python/testData/codeInsight/controlflow/IfTrue.txt similarity index 100% rename from python/testData/codeInsight/controlflow/iftrue.txt rename to python/testData/codeInsight/controlflow/IfTrue.txt diff --git a/python/testData/codeInsight/controlflow/implicitnegativetypeassertionafterif.py b/python/testData/codeInsight/controlflow/ImplicitNegativeTypeAssertionAfterIf.py similarity index 100% rename from python/testData/codeInsight/controlflow/implicitnegativetypeassertionafterif.py rename to python/testData/codeInsight/controlflow/ImplicitNegativeTypeAssertionAfterIf.py diff --git a/python/testData/codeInsight/controlflow/implicitnegativetypeassertionafterif.txt b/python/testData/codeInsight/controlflow/ImplicitNegativeTypeAssertionAfterIf.txt similarity index 100% rename from python/testData/codeInsight/controlflow/implicitnegativetypeassertionafterif.txt rename to python/testData/codeInsight/controlflow/ImplicitNegativeTypeAssertionAfterIf.txt diff --git a/python/testData/codeInsight/controlflow/implicitnegativetypeassertionaftertwonestedif.py b/python/testData/codeInsight/controlflow/ImplicitNegativeTypeAssertionAfterTwoNestedIf.py similarity index 100% rename from python/testData/codeInsight/controlflow/implicitnegativetypeassertionaftertwonestedif.py rename to python/testData/codeInsight/controlflow/ImplicitNegativeTypeAssertionAfterTwoNestedIf.py diff --git a/python/testData/codeInsight/controlflow/implicitnegativetypeassertionaftertwonestedif.txt b/python/testData/codeInsight/controlflow/ImplicitNegativeTypeAssertionAfterTwoNestedIf.txt similarity index 100% rename from python/testData/codeInsight/controlflow/implicitnegativetypeassertionaftertwonestedif.txt rename to python/testData/codeInsight/controlflow/ImplicitNegativeTypeAssertionAfterTwoNestedIf.txt diff --git a/python/testData/codeInsight/controlflow/import.py b/python/testData/codeInsight/controlflow/Import.py similarity index 100% rename from python/testData/codeInsight/controlflow/import.py rename to python/testData/codeInsight/controlflow/Import.py diff --git a/python/testData/codeInsight/controlflow/import.txt b/python/testData/codeInsight/controlflow/Import.txt similarity index 100% rename from python/testData/codeInsight/controlflow/import.txt rename to python/testData/codeInsight/controlflow/Import.txt diff --git a/python/testData/codeInsight/controlflow/isinstance.py b/python/testData/codeInsight/controlflow/Isinstance.py similarity index 100% rename from python/testData/codeInsight/controlflow/isinstance.py rename to python/testData/codeInsight/controlflow/Isinstance.py diff --git a/python/testData/codeInsight/controlflow/isinstance.txt b/python/testData/codeInsight/controlflow/Isinstance.txt similarity index 100% rename from python/testData/codeInsight/controlflow/isinstance.txt rename to python/testData/codeInsight/controlflow/Isinstance.txt diff --git a/python/testData/codeInsight/controlflow/lambda.py b/python/testData/codeInsight/controlflow/Lambda.py similarity index 100% rename from python/testData/codeInsight/controlflow/lambda.py rename to python/testData/codeInsight/controlflow/Lambda.py diff --git a/python/testData/codeInsight/controlflow/lambda.txt b/python/testData/codeInsight/controlflow/Lambda.txt similarity index 100% rename from python/testData/codeInsight/controlflow/lambda.txt rename to python/testData/codeInsight/controlflow/Lambda.txt diff --git a/python/testData/codeInsight/controlflow/lambdadefaultparameter.py b/python/testData/codeInsight/controlflow/LambdaDefaultParameter.py similarity index 100% rename from python/testData/codeInsight/controlflow/lambdadefaultparameter.py rename to python/testData/codeInsight/controlflow/LambdaDefaultParameter.py diff --git a/python/testData/codeInsight/controlflow/lambdadefaultparameter.txt b/python/testData/codeInsight/controlflow/LambdaDefaultParameter.txt similarity index 100% rename from python/testData/codeInsight/controlflow/lambdadefaultparameter.txt rename to python/testData/codeInsight/controlflow/LambdaDefaultParameter.txt diff --git a/python/testData/codeInsight/controlflow/listcomp.py b/python/testData/codeInsight/controlflow/ListComp.py similarity index 100% rename from python/testData/codeInsight/controlflow/listcomp.py rename to python/testData/codeInsight/controlflow/ListComp.py diff --git a/python/testData/codeInsight/controlflow/listcomp.txt b/python/testData/codeInsight/controlflow/ListComp.txt similarity index 100% rename from python/testData/codeInsight/controlflow/listcomp.txt rename to python/testData/codeInsight/controlflow/ListComp.txt diff --git a/python/testData/codeInsight/controlflow/manyifs.py b/python/testData/codeInsight/controlflow/ManyIfs.py similarity index 100% rename from python/testData/codeInsight/controlflow/manyifs.py rename to python/testData/codeInsight/controlflow/ManyIfs.py diff --git a/python/testData/codeInsight/controlflow/manyifs.txt b/python/testData/codeInsight/controlflow/ManyIfs.txt similarity index 100% rename from python/testData/codeInsight/controlflow/manyifs.txt rename to python/testData/codeInsight/controlflow/ManyIfs.txt diff --git a/python/testData/codeInsight/controlflow/orbooleanexpression.py b/python/testData/codeInsight/controlflow/OrBooleanExpression.py similarity index 100% rename from python/testData/codeInsight/controlflow/orbooleanexpression.py rename to python/testData/codeInsight/controlflow/OrBooleanExpression.py diff --git a/python/testData/codeInsight/controlflow/orbooleanexpression.txt b/python/testData/codeInsight/controlflow/OrBooleanExpression.txt similarity index 100% rename from python/testData/codeInsight/controlflow/orbooleanexpression.txt rename to python/testData/codeInsight/controlflow/OrBooleanExpression.txt diff --git a/python/testData/codeInsight/controlflow/positiveiteration.py b/python/testData/codeInsight/controlflow/PositiveIteration.py similarity index 100% rename from python/testData/codeInsight/controlflow/positiveiteration.py rename to python/testData/codeInsight/controlflow/PositiveIteration.py diff --git a/python/testData/codeInsight/controlflow/positiveiteration.txt b/python/testData/codeInsight/controlflow/PositiveIteration.txt similarity index 100% rename from python/testData/codeInsight/controlflow/positiveiteration.txt rename to python/testData/codeInsight/controlflow/PositiveIteration.txt diff --git a/python/testData/codeInsight/controlflow/qualifiedselfreference.py b/python/testData/codeInsight/controlflow/QualifiedSelfReference.py similarity index 100% rename from python/testData/codeInsight/controlflow/qualifiedselfreference.py rename to python/testData/codeInsight/controlflow/QualifiedSelfReference.py diff --git a/python/testData/codeInsight/controlflow/qualifiedselfreference.txt b/python/testData/codeInsight/controlflow/QualifiedSelfReference.txt similarity index 100% rename from python/testData/codeInsight/controlflow/qualifiedselfreference.txt rename to python/testData/codeInsight/controlflow/QualifiedSelfReference.txt diff --git a/python/testData/codeInsight/controlflow/raise.py b/python/testData/codeInsight/controlflow/Raise.py similarity index 100% rename from python/testData/codeInsight/controlflow/raise.py rename to python/testData/codeInsight/controlflow/Raise.py diff --git a/python/testData/codeInsight/controlflow/raise.txt b/python/testData/codeInsight/controlflow/Raise.txt similarity index 100% rename from python/testData/codeInsight/controlflow/raise.txt rename to python/testData/codeInsight/controlflow/Raise.txt diff --git a/python/testData/codeInsight/controlflow/return.py b/python/testData/codeInsight/controlflow/Return.py similarity index 100% rename from python/testData/codeInsight/controlflow/return.py rename to python/testData/codeInsight/controlflow/Return.py diff --git a/python/testData/codeInsight/controlflow/return.txt b/python/testData/codeInsight/controlflow/Return.txt similarity index 100% rename from python/testData/codeInsight/controlflow/return.txt rename to python/testData/codeInsight/controlflow/Return.txt diff --git a/python/testData/codeInsight/controlflow/returnfor.py b/python/testData/codeInsight/controlflow/ReturnFor.py similarity index 100% rename from python/testData/codeInsight/controlflow/returnfor.py rename to python/testData/codeInsight/controlflow/ReturnFor.py diff --git a/python/testData/codeInsight/controlflow/returnfor.txt b/python/testData/codeInsight/controlflow/ReturnFor.txt similarity index 100% rename from python/testData/codeInsight/controlflow/returnfor.txt rename to python/testData/codeInsight/controlflow/ReturnFor.txt diff --git a/python/testData/codeInsight/controlflow/self.py b/python/testData/codeInsight/controlflow/Self.py similarity index 100% rename from python/testData/codeInsight/controlflow/self.py rename to python/testData/codeInsight/controlflow/Self.py diff --git a/python/testData/codeInsight/controlflow/self.txt b/python/testData/codeInsight/controlflow/Self.txt similarity index 100% rename from python/testData/codeInsight/controlflow/self.txt rename to python/testData/codeInsight/controlflow/Self.txt diff --git a/python/testData/codeInsight/controlflow/setcomprehension.py b/python/testData/codeInsight/controlflow/SetComprehension.py similarity index 100% rename from python/testData/codeInsight/controlflow/setcomprehension.py rename to python/testData/codeInsight/controlflow/SetComprehension.py diff --git a/python/testData/codeInsight/controlflow/setcomprehension.txt b/python/testData/codeInsight/controlflow/SetComprehension.txt similarity index 100% rename from python/testData/codeInsight/controlflow/setcomprehension.txt rename to python/testData/codeInsight/controlflow/SetComprehension.txt diff --git a/python/testData/codeInsight/controlflow/sliceassignment.py b/python/testData/codeInsight/controlflow/SliceAssignment.py similarity index 100% rename from python/testData/codeInsight/controlflow/sliceassignment.py rename to python/testData/codeInsight/controlflow/SliceAssignment.py diff --git a/python/testData/codeInsight/controlflow/sliceassignment.txt b/python/testData/codeInsight/controlflow/SliceAssignment.txt similarity index 100% rename from python/testData/codeInsight/controlflow/sliceassignment.txt rename to python/testData/codeInsight/controlflow/SliceAssignment.txt diff --git a/python/testData/codeInsight/controlflow/superclass.py b/python/testData/codeInsight/controlflow/Superclass.py similarity index 100% rename from python/testData/codeInsight/controlflow/superclass.py rename to python/testData/codeInsight/controlflow/Superclass.py diff --git a/python/testData/codeInsight/controlflow/superclass.txt b/python/testData/codeInsight/controlflow/Superclass.txt similarity index 100% rename from python/testData/codeInsight/controlflow/superclass.txt rename to python/testData/codeInsight/controlflow/Superclass.txt diff --git a/python/testData/codeInsight/controlflow/try.py b/python/testData/codeInsight/controlflow/Try.py similarity index 100% rename from python/testData/codeInsight/controlflow/try.py rename to python/testData/codeInsight/controlflow/Try.py diff --git a/python/testData/codeInsight/controlflow/try.txt b/python/testData/codeInsight/controlflow/Try.txt similarity index 100% rename from python/testData/codeInsight/controlflow/try.txt rename to python/testData/codeInsight/controlflow/Try.txt diff --git a/python/testData/codeInsight/controlflow/trybreak.py b/python/testData/codeInsight/controlflow/TryBreak.py similarity index 100% rename from python/testData/codeInsight/controlflow/trybreak.py rename to python/testData/codeInsight/controlflow/TryBreak.py diff --git a/python/testData/codeInsight/controlflow/trybreak.txt b/python/testData/codeInsight/controlflow/TryBreak.txt similarity index 100% rename from python/testData/codeInsight/controlflow/trybreak.txt rename to python/testData/codeInsight/controlflow/TryBreak.txt diff --git a/python/testData/codeInsight/controlflow/tryexceptelsefinally.py b/python/testData/codeInsight/controlflow/TryExceptElseFinally.py similarity index 100% rename from python/testData/codeInsight/controlflow/tryexceptelsefinally.py rename to python/testData/codeInsight/controlflow/TryExceptElseFinally.py diff --git a/python/testData/codeInsight/controlflow/tryexceptelsefinally.txt b/python/testData/codeInsight/controlflow/TryExceptElseFinally.txt similarity index 100% rename from python/testData/codeInsight/controlflow/tryexceptelsefinally.txt rename to python/testData/codeInsight/controlflow/TryExceptElseFinally.txt diff --git a/python/testData/codeInsight/controlflow/tryfinally.py b/python/testData/codeInsight/controlflow/TryFinally.py similarity index 100% rename from python/testData/codeInsight/controlflow/tryfinally.py rename to python/testData/codeInsight/controlflow/TryFinally.py diff --git a/python/testData/codeInsight/controlflow/tryfinally.txt b/python/testData/codeInsight/controlflow/TryFinally.txt similarity index 100% rename from python/testData/codeInsight/controlflow/tryfinally.txt rename to python/testData/codeInsight/controlflow/TryFinally.txt diff --git a/python/testData/codeInsight/controlflow/tryraisefinally.py b/python/testData/codeInsight/controlflow/TryRaiseFinally.py similarity index 100% rename from python/testData/codeInsight/controlflow/tryraisefinally.py rename to python/testData/codeInsight/controlflow/TryRaiseFinally.py diff --git a/python/testData/codeInsight/controlflow/tryraisefinally.txt b/python/testData/codeInsight/controlflow/TryRaiseFinally.txt similarity index 100% rename from python/testData/codeInsight/controlflow/tryraisefinally.txt rename to python/testData/codeInsight/controlflow/TryRaiseFinally.txt diff --git a/python/testData/codeInsight/controlflow/trytry.py b/python/testData/codeInsight/controlflow/TryTry.py similarity index 100% rename from python/testData/codeInsight/controlflow/trytry.py rename to python/testData/codeInsight/controlflow/TryTry.py diff --git a/python/testData/codeInsight/controlflow/trytry.txt b/python/testData/codeInsight/controlflow/TryTry.txt similarity index 100% rename from python/testData/codeInsight/controlflow/trytry.txt rename to python/testData/codeInsight/controlflow/TryTry.txt diff --git a/python/testData/codeInsight/controlflow/typeannotations.py b/python/testData/codeInsight/controlflow/TypeAnnotations.py similarity index 100% rename from python/testData/codeInsight/controlflow/typeannotations.py rename to python/testData/codeInsight/controlflow/TypeAnnotations.py diff --git a/python/testData/codeInsight/controlflow/typeannotations.txt b/python/testData/codeInsight/controlflow/TypeAnnotations.txt similarity index 100% rename from python/testData/codeInsight/controlflow/typeannotations.txt rename to python/testData/codeInsight/controlflow/TypeAnnotations.txt diff --git a/python/testData/codeInsight/controlflow/typesinandbooleanexpression.py b/python/testData/codeInsight/controlflow/TypesInAndBooleanExpression.py similarity index 100% rename from python/testData/codeInsight/controlflow/typesinandbooleanexpression.py rename to python/testData/codeInsight/controlflow/TypesInAndBooleanExpression.py diff --git a/python/testData/codeInsight/controlflow/typesinandbooleanexpression.txt b/python/testData/codeInsight/controlflow/TypesInAndBooleanExpression.txt similarity index 100% rename from python/testData/codeInsight/controlflow/typesinandbooleanexpression.txt rename to python/testData/codeInsight/controlflow/TypesInAndBooleanExpression.txt diff --git a/python/testData/codeInsight/controlflow/typesinorbooleanexpression.py b/python/testData/codeInsight/controlflow/TypesInOrBooleanExpression.py similarity index 100% rename from python/testData/codeInsight/controlflow/typesinorbooleanexpression.py rename to python/testData/codeInsight/controlflow/TypesInOrBooleanExpression.py diff --git a/python/testData/codeInsight/controlflow/typesinorbooleanexpression.txt b/python/testData/codeInsight/controlflow/TypesInOrBooleanExpression.txt similarity index 100% rename from python/testData/codeInsight/controlflow/typesinorbooleanexpression.txt rename to python/testData/codeInsight/controlflow/TypesInOrBooleanExpression.txt diff --git a/python/testData/codeInsight/controlflow/variableannotations.py b/python/testData/codeInsight/controlflow/VariableAnnotations.py similarity index 100% rename from python/testData/codeInsight/controlflow/variableannotations.py rename to python/testData/codeInsight/controlflow/VariableAnnotations.py diff --git a/python/testData/codeInsight/controlflow/variableannotations.txt b/python/testData/codeInsight/controlflow/VariableAnnotations.txt similarity index 100% rename from python/testData/codeInsight/controlflow/variableannotations.txt rename to python/testData/codeInsight/controlflow/VariableAnnotations.txt diff --git a/python/testData/codeInsight/controlflow/while.py b/python/testData/codeInsight/controlflow/While.py similarity index 100% rename from python/testData/codeInsight/controlflow/while.py rename to python/testData/codeInsight/controlflow/While.py diff --git a/python/testData/codeInsight/controlflow/while.txt b/python/testData/codeInsight/controlflow/While.txt similarity index 100% rename from python/testData/codeInsight/controlflow/while.txt rename to python/testData/codeInsight/controlflow/While.txt diff --git a/python/testData/codeInsight/controlflow/whiletrueelse.py b/python/testData/codeInsight/controlflow/WhileTrueElse.py similarity index 100% rename from python/testData/codeInsight/controlflow/whiletrueelse.py rename to python/testData/codeInsight/controlflow/WhileTrueElse.py diff --git a/python/testData/codeInsight/controlflow/whiletrueelse.txt b/python/testData/codeInsight/controlflow/WhileTrueElse.txt similarity index 100% rename from python/testData/codeInsight/controlflow/whiletrueelse.txt rename to python/testData/codeInsight/controlflow/WhileTrueElse.txt diff --git a/python/testData/codeInsight/controlflow/withraiseexception.py b/python/testData/codeInsight/controlflow/WithRaiseException.py similarity index 100% rename from python/testData/codeInsight/controlflow/withraiseexception.py rename to python/testData/codeInsight/controlflow/WithRaiseException.py diff --git a/python/testData/codeInsight/controlflow/withraiseexception.txt b/python/testData/codeInsight/controlflow/WithRaiseException.txt similarity index 100% rename from python/testData/codeInsight/controlflow/withraiseexception.txt rename to python/testData/codeInsight/controlflow/WithRaiseException.txt diff --git a/python/testData/codeInsight/controlflow/exit.py b/python/testData/codeInsight/controlflow/exit.py deleted file mode 100644 index 12c0b835ee38..000000000000 --- a/python/testData/codeInsight/controlflow/exit.py +++ /dev/null @@ -1,7 +0,0 @@ -a = read() -if a.startswith("Exit"): - exit(a[5,].to_i) -else: - print a - -exit(0) diff --git a/python/testData/codeInsight/controlflow/exit.txt b/python/testData/codeInsight/controlflow/exit.txt deleted file mode 100644 index c99a6b8ed7e1..000000000000 --- a/python/testData/codeInsight/controlflow/exit.txt +++ /dev/null @@ -1,15 +0,0 @@ -0(1) element: null -1(2) element: PyAssignmentStatement -2(3) READ ACCESS: read -3(4) WRITE ACCESS: a -4(5) element: PyIfStatement -5(6,10) READ ACCESS: a -6(7) element: PyStatementList. Condition: a.startswith("Exit"):true -7(8) element: PyExpressionStatement -8(9) element: PySubscriptionExpression -9(14) READ ACCESS: a -10(11) element: PyElsePart. Condition: a.startswith("Exit"):false -11(12) element: PyPrintStatement -12(13) READ ACCESS: a -13(14) element: PyExpressionStatement -14() element: null \ No newline at end of file diff --git a/python/testSrc/com/jetbrains/python/PyControlFlowBuilderTest.java b/python/testSrc/com/jetbrains/python/PyControlFlowBuilderTest.java index 7c1da45926c4..30c4df2c6661 100644 --- a/python/testSrc/com/jetbrains/python/PyControlFlowBuilderTest.java +++ b/python/testSrc/com/jetbrains/python/PyControlFlowBuilderTest.java @@ -27,7 +27,7 @@ public class PyControlFlowBuilderTest extends LightMarkedTestCase { } private void doTest() { - final String testName = getTestName(false).toLowerCase(); + final String testName = getTestName(false); configureByFile(testName + ".py"); final ControlFlow flow = ControlFlowCache.getControlFlow((PyFile)myFile); final String fullPath = getTestDataPath() + testName + ".txt"; @@ -179,7 +179,7 @@ public class PyControlFlowBuilderTest extends LightMarkedTestCase { } public void testQualifiedSelfReference() { - final String testName = getTestName(false).toLowerCase(); + final String testName = getTestName(false); configureByFile(testName + ".py"); final String fullPath = getTestDataPath() + testName + ".txt"; final PyClass pyClass = ((PyFile) myFile).getTopLevelClasses().get(0); @@ -188,7 +188,7 @@ public class PyControlFlowBuilderTest extends LightMarkedTestCase { } public void testSelf() { - final String testName = getTestName(false).toLowerCase(); + final String testName = getTestName(false); configureByFile(testName + ".py"); final String fullPath = getTestDataPath() + testName + ".txt"; final PyClass pyClass = ((PyFile) myFile).getTopLevelClasses().get(0); @@ -197,7 +197,7 @@ public class PyControlFlowBuilderTest extends LightMarkedTestCase { } public void testTryBreak() { - final String testName = getTestName(false).toLowerCase(); + final String testName = getTestName(false); configureByFile(testName + ".py"); final ControlFlow flow = ControlFlowCache.getControlFlow((PyFunction)((PyFile)myFile).getStatements().get(0)); final String fullPath = getTestDataPath() + testName + ".txt"; @@ -319,7 +319,7 @@ public class PyControlFlowBuilderTest extends LightMarkedTestCase { } private void doTestFirstStatement() { - final String testName = getTestName(false).toLowerCase(); + final String testName = getTestName(false); configureByFile(testName + ".py"); final String fullPath = getTestDataPath() + testName + ".txt"; final ControlFlow flow = ControlFlowCache.getControlFlow((ScopeOwner)((PyFile)myFile).getStatements().get(0));