diff --git a/testData/refactoring/introduceParameter/afterAnonymousClass.java b/java/java-tests/testData/refactoring/introduceParameter/afterAnonymousClass.java similarity index 100% rename from testData/refactoring/introduceParameter/afterAnonymousClass.java rename to java/java-tests/testData/refactoring/introduceParameter/afterAnonymousClass.java diff --git a/testData/refactoring/introduceParameter/afterConflictingField.java b/java/java-tests/testData/refactoring/introduceParameter/afterConflictingField.java similarity index 100% rename from testData/refactoring/introduceParameter/afterConflictingField.java rename to java/java-tests/testData/refactoring/introduceParameter/afterConflictingField.java diff --git a/testData/refactoring/introduceParameter/afterEnums.java b/java/java-tests/testData/refactoring/introduceParameter/afterEnums.java similarity index 100% rename from testData/refactoring/introduceParameter/afterEnums.java rename to java/java-tests/testData/refactoring/introduceParameter/afterEnums.java diff --git a/testData/refactoring/introduceParameter/afterExpectedType.java b/java/java-tests/testData/refactoring/introduceParameter/afterExpectedType.java similarity index 100% rename from testData/refactoring/introduceParameter/afterExpectedType.java rename to java/java-tests/testData/refactoring/introduceParameter/afterExpectedType.java diff --git a/testData/refactoring/introduceParameter/afterFieldAccess.java b/java/java-tests/testData/refactoring/introduceParameter/afterFieldAccess.java similarity index 100% rename from testData/refactoring/introduceParameter/afterFieldAccess.java rename to java/java-tests/testData/refactoring/introduceParameter/afterFieldAccess.java diff --git a/testData/refactoring/introduceParameter/afterFieldWithGetterReplacement.java b/java/java-tests/testData/refactoring/introduceParameter/afterFieldWithGetterReplacement.java similarity index 100% rename from testData/refactoring/introduceParameter/afterFieldWithGetterReplacement.java rename to java/java-tests/testData/refactoring/introduceParameter/afterFieldWithGetterReplacement.java diff --git a/testData/refactoring/introduceParameter/afterFieldWithInaccessibleGetterReplacement.java b/java/java-tests/testData/refactoring/introduceParameter/afterFieldWithInaccessibleGetterReplacement.java similarity index 100% rename from testData/refactoring/introduceParameter/afterFieldWithInaccessibleGetterReplacement.java rename to java/java-tests/testData/refactoring/introduceParameter/afterFieldWithInaccessibleGetterReplacement.java diff --git a/testData/refactoring/introduceParameter/afterGenerateDelegate.java b/java/java-tests/testData/refactoring/introduceParameter/afterGenerateDelegate.java similarity index 100% rename from testData/refactoring/introduceParameter/afterGenerateDelegate.java rename to java/java-tests/testData/refactoring/introduceParameter/afterGenerateDelegate.java diff --git a/testData/refactoring/introduceParameter/afterGenerateDelegateNoArgs.java b/java/java-tests/testData/refactoring/introduceParameter/afterGenerateDelegateNoArgs.java similarity index 100% rename from testData/refactoring/introduceParameter/afterGenerateDelegateNoArgs.java rename to java/java-tests/testData/refactoring/introduceParameter/afterGenerateDelegateNoArgs.java diff --git a/testData/refactoring/introduceParameter/afterGenerateDelegateRemoveParameter.java b/java/java-tests/testData/refactoring/introduceParameter/afterGenerateDelegateRemoveParameter.java similarity index 100% rename from testData/refactoring/introduceParameter/afterGenerateDelegateRemoveParameter.java rename to java/java-tests/testData/refactoring/introduceParameter/afterGenerateDelegateRemoveParameter.java diff --git a/testData/refactoring/introduceParameter/afterImplicitDefaultConstructor.java b/java/java-tests/testData/refactoring/introduceParameter/afterImplicitDefaultConstructor.java similarity index 100% rename from testData/refactoring/introduceParameter/afterImplicitDefaultConstructor.java rename to java/java-tests/testData/refactoring/introduceParameter/afterImplicitDefaultConstructor.java diff --git a/testData/refactoring/introduceParameter/afterImplicitSuperCall.java b/java/java-tests/testData/refactoring/introduceParameter/afterImplicitSuperCall.java similarity index 100% rename from testData/refactoring/introduceParameter/afterImplicitSuperCall.java rename to java/java-tests/testData/refactoring/introduceParameter/afterImplicitSuperCall.java diff --git a/testData/refactoring/introduceParameter/afterIncorrectScope.java b/java/java-tests/testData/refactoring/introduceParameter/afterIncorrectScope.java similarity index 100% rename from testData/refactoring/introduceParameter/afterIncorrectScope.java rename to java/java-tests/testData/refactoring/introduceParameter/afterIncorrectScope.java diff --git a/testData/refactoring/introduceParameter/afterInternalSideEffect.java b/java/java-tests/testData/refactoring/introduceParameter/afterInternalSideEffect.java similarity index 100% rename from testData/refactoring/introduceParameter/afterInternalSideEffect.java rename to java/java-tests/testData/refactoring/introduceParameter/afterInternalSideEffect.java diff --git a/testData/refactoring/introduceParameter/afterLocalVarDeclaration.java b/java/java-tests/testData/refactoring/introduceParameter/afterLocalVarDeclaration.java similarity index 100% rename from testData/refactoring/introduceParameter/afterLocalVarDeclaration.java rename to java/java-tests/testData/refactoring/introduceParameter/afterLocalVarDeclaration.java diff --git a/testData/refactoring/introduceParameter/afterLocalVarSelection.java b/java/java-tests/testData/refactoring/introduceParameter/afterLocalVarSelection.java similarity index 100% rename from testData/refactoring/introduceParameter/afterLocalVarSelection.java rename to java/java-tests/testData/refactoring/introduceParameter/afterLocalVarSelection.java diff --git a/testData/refactoring/introduceParameter/afterMethodAccess.java b/java/java-tests/testData/refactoring/introduceParameter/afterMethodAccess.java similarity index 100% rename from testData/refactoring/introduceParameter/afterMethodAccess.java rename to java/java-tests/testData/refactoring/introduceParameter/afterMethodAccess.java diff --git a/testData/refactoring/introduceParameter/afterMethodUsageInThisMethodInheritor.java b/java/java-tests/testData/refactoring/introduceParameter/afterMethodUsageInThisMethodInheritor.java similarity index 100% rename from testData/refactoring/introduceParameter/afterMethodUsageInThisMethodInheritor.java rename to java/java-tests/testData/refactoring/introduceParameter/afterMethodUsageInThisMethodInheritor.java diff --git a/testData/refactoring/introduceParameter/afterMethodWithoutParams.java b/java/java-tests/testData/refactoring/introduceParameter/afterMethodWithoutParams.java similarity index 100% rename from testData/refactoring/introduceParameter/afterMethodWithoutParams.java rename to java/java-tests/testData/refactoring/introduceParameter/afterMethodWithoutParams.java diff --git a/testData/refactoring/introduceParameter/afterNoUsages.java b/java/java-tests/testData/refactoring/introduceParameter/afterNoUsages.java similarity index 100% rename from testData/refactoring/introduceParameter/afterNoUsages.java rename to java/java-tests/testData/refactoring/introduceParameter/afterNoUsages.java diff --git a/testData/refactoring/introduceParameter/afterNull.java b/java/java-tests/testData/refactoring/introduceParameter/afterNull.java similarity index 100% rename from testData/refactoring/introduceParameter/afterNull.java rename to java/java-tests/testData/refactoring/introduceParameter/afterNull.java diff --git a/testData/refactoring/introduceParameter/afterParameterInFor.java b/java/java-tests/testData/refactoring/introduceParameter/afterParameterInFor.java similarity index 100% rename from testData/refactoring/introduceParameter/afterParameterInFor.java rename to java/java-tests/testData/refactoring/introduceParameter/afterParameterInFor.java diff --git a/testData/refactoring/introduceParameter/afterParameterJavaDoc1.java b/java/java-tests/testData/refactoring/introduceParameter/afterParameterJavaDoc1.java similarity index 100% rename from testData/refactoring/introduceParameter/afterParameterJavaDoc1.java rename to java/java-tests/testData/refactoring/introduceParameter/afterParameterJavaDoc1.java diff --git a/testData/refactoring/introduceParameter/afterParameterJavaDoc2.java b/java/java-tests/testData/refactoring/introduceParameter/afterParameterJavaDoc2.java similarity index 100% rename from testData/refactoring/introduceParameter/afterParameterJavaDoc2.java rename to java/java-tests/testData/refactoring/introduceParameter/afterParameterJavaDoc2.java diff --git a/testData/refactoring/introduceParameter/afterParameterJavaDoc3.java b/java/java-tests/testData/refactoring/introduceParameter/afterParameterJavaDoc3.java similarity index 100% rename from testData/refactoring/introduceParameter/afterParameterJavaDoc3.java rename to java/java-tests/testData/refactoring/introduceParameter/afterParameterJavaDoc3.java diff --git a/testData/refactoring/introduceParameter/afterParameterJavaDocBeforeVararg.java b/java/java-tests/testData/refactoring/introduceParameter/afterParameterJavaDocBeforeVararg.java similarity index 100% rename from testData/refactoring/introduceParameter/afterParameterJavaDocBeforeVararg.java rename to java/java-tests/testData/refactoring/introduceParameter/afterParameterJavaDocBeforeVararg.java diff --git a/testData/refactoring/introduceParameter/afterParameterSubstitution.java b/java/java-tests/testData/refactoring/introduceParameter/afterParameterSubstitution.java similarity index 100% rename from testData/refactoring/introduceParameter/afterParameterSubstitution.java rename to java/java-tests/testData/refactoring/introduceParameter/afterParameterSubstitution.java diff --git a/testData/refactoring/introduceParameter/afterQualifiedNew.java b/java/java-tests/testData/refactoring/introduceParameter/afterQualifiedNew.java similarity index 100% rename from testData/refactoring/introduceParameter/afterQualifiedNew.java rename to java/java-tests/testData/refactoring/introduceParameter/afterQualifiedNew.java diff --git a/testData/refactoring/introduceParameter/afterRemoveParameter.java b/java/java-tests/testData/refactoring/introduceParameter/afterRemoveParameter.java similarity index 100% rename from testData/refactoring/introduceParameter/afterRemoveParameter.java rename to java/java-tests/testData/refactoring/introduceParameter/afterRemoveParameter.java diff --git a/testData/refactoring/introduceParameter/afterRemoveParameterAfterVariable.java b/java/java-tests/testData/refactoring/introduceParameter/afterRemoveParameterAfterVariable.java similarity index 100% rename from testData/refactoring/introduceParameter/afterRemoveParameterAfterVariable.java rename to java/java-tests/testData/refactoring/introduceParameter/afterRemoveParameterAfterVariable.java diff --git a/testData/refactoring/introduceParameter/afterRemoveParameterInHierarchy.java b/java/java-tests/testData/refactoring/introduceParameter/afterRemoveParameterInHierarchy.java similarity index 100% rename from testData/refactoring/introduceParameter/afterRemoveParameterInHierarchy.java rename to java/java-tests/testData/refactoring/introduceParameter/afterRemoveParameterInHierarchy.java diff --git a/testData/refactoring/introduceParameter/afterRemoveParameterWithJavadoc.java b/java/java-tests/testData/refactoring/introduceParameter/afterRemoveParameterWithJavadoc.java similarity index 100% rename from testData/refactoring/introduceParameter/afterRemoveParameterWithJavadoc.java rename to java/java-tests/testData/refactoring/introduceParameter/afterRemoveParameterWithJavadoc.java diff --git a/testData/refactoring/introduceParameter/afterSimpleUsage.java b/java/java-tests/testData/refactoring/introduceParameter/afterSimpleUsage.java similarity index 100% rename from testData/refactoring/introduceParameter/afterSimpleUsage.java rename to java/java-tests/testData/refactoring/introduceParameter/afterSimpleUsage.java diff --git a/testData/refactoring/introduceParameter/afterStaticFieldAccess.java b/java/java-tests/testData/refactoring/introduceParameter/afterStaticFieldAccess.java similarity index 100% rename from testData/refactoring/introduceParameter/afterStaticFieldAccess.java rename to java/java-tests/testData/refactoring/introduceParameter/afterStaticFieldAccess.java diff --git a/testData/refactoring/introduceParameter/afterSuperInExpression.java b/java/java-tests/testData/refactoring/introduceParameter/afterSuperInExpression.java similarity index 100% rename from testData/refactoring/introduceParameter/afterSuperInExpression.java rename to java/java-tests/testData/refactoring/introduceParameter/afterSuperInExpression.java diff --git a/testData/refactoring/introduceParameter/afterSuperWithSideEffect.java b/java/java-tests/testData/refactoring/introduceParameter/afterSuperWithSideEffect.java similarity index 100% rename from testData/refactoring/introduceParameter/afterSuperWithSideEffect.java rename to java/java-tests/testData/refactoring/introduceParameter/afterSuperWithSideEffect.java diff --git a/testData/refactoring/introduceParameter/afterThisSubstitution.java b/java/java-tests/testData/refactoring/introduceParameter/afterThisSubstitution.java similarity index 100% rename from testData/refactoring/introduceParameter/afterThisSubstitution.java rename to java/java-tests/testData/refactoring/introduceParameter/afterThisSubstitution.java diff --git a/testData/refactoring/introduceParameter/afterThisSubstitutionInQualifier.java b/java/java-tests/testData/refactoring/introduceParameter/afterThisSubstitutionInQualifier.java similarity index 100% rename from testData/refactoring/introduceParameter/afterThisSubstitutionInQualifier.java rename to java/java-tests/testData/refactoring/introduceParameter/afterThisSubstitutionInQualifier.java diff --git a/testData/refactoring/introduceParameter/afterUseInInnerClass.java b/java/java-tests/testData/refactoring/introduceParameter/afterUseInInnerClass.java similarity index 100% rename from testData/refactoring/introduceParameter/afterUseInInnerClass.java rename to java/java-tests/testData/refactoring/introduceParameter/afterUseInInnerClass.java diff --git a/testData/refactoring/introduceParameter/afterVarargs.java b/java/java-tests/testData/refactoring/introduceParameter/afterVarargs.java similarity index 100% rename from testData/refactoring/introduceParameter/afterVarargs.java rename to java/java-tests/testData/refactoring/introduceParameter/afterVarargs.java diff --git a/testData/refactoring/introduceParameter/afterVarargs1.java b/java/java-tests/testData/refactoring/introduceParameter/afterVarargs1.java similarity index 100% rename from testData/refactoring/introduceParameter/afterVarargs1.java rename to java/java-tests/testData/refactoring/introduceParameter/afterVarargs1.java diff --git a/testData/refactoring/introduceParameter/afterWeirdQualifier.java b/java/java-tests/testData/refactoring/introduceParameter/afterWeirdQualifier.java similarity index 100% rename from testData/refactoring/introduceParameter/afterWeirdQualifier.java rename to java/java-tests/testData/refactoring/introduceParameter/afterWeirdQualifier.java diff --git a/testData/refactoring/introduceParameter/afterWeirdQualifierAndParameter.java b/java/java-tests/testData/refactoring/introduceParameter/afterWeirdQualifierAndParameter.java similarity index 100% rename from testData/refactoring/introduceParameter/afterWeirdQualifierAndParameter.java rename to java/java-tests/testData/refactoring/introduceParameter/afterWeirdQualifierAndParameter.java diff --git a/testData/refactoring/introduceParameter/beforeAnonymousClass.java b/java/java-tests/testData/refactoring/introduceParameter/beforeAnonymousClass.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeAnonymousClass.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeAnonymousClass.java diff --git a/testData/refactoring/introduceParameter/beforeConflictingField.java b/java/java-tests/testData/refactoring/introduceParameter/beforeConflictingField.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeConflictingField.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeConflictingField.java diff --git a/testData/refactoring/introduceParameter/beforeEnums.java b/java/java-tests/testData/refactoring/introduceParameter/beforeEnums.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeEnums.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeEnums.java diff --git a/testData/refactoring/introduceParameter/beforeExpectedType.java b/java/java-tests/testData/refactoring/introduceParameter/beforeExpectedType.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeExpectedType.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeExpectedType.java diff --git a/testData/refactoring/introduceParameter/beforeFieldAccess.java b/java/java-tests/testData/refactoring/introduceParameter/beforeFieldAccess.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeFieldAccess.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeFieldAccess.java diff --git a/testData/refactoring/introduceParameter/beforeFieldWithGetterReplacement.java b/java/java-tests/testData/refactoring/introduceParameter/beforeFieldWithGetterReplacement.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeFieldWithGetterReplacement.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeFieldWithGetterReplacement.java diff --git a/testData/refactoring/introduceParameter/beforeFieldWithInaccessibleGetterReplacement.java b/java/java-tests/testData/refactoring/introduceParameter/beforeFieldWithInaccessibleGetterReplacement.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeFieldWithInaccessibleGetterReplacement.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeFieldWithInaccessibleGetterReplacement.java diff --git a/testData/refactoring/introduceParameter/beforeGenerateDelegate.java b/java/java-tests/testData/refactoring/introduceParameter/beforeGenerateDelegate.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeGenerateDelegate.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeGenerateDelegate.java diff --git a/testData/refactoring/introduceParameter/beforeGenerateDelegateNoArgs.java b/java/java-tests/testData/refactoring/introduceParameter/beforeGenerateDelegateNoArgs.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeGenerateDelegateNoArgs.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeGenerateDelegateNoArgs.java diff --git a/testData/refactoring/introduceParameter/beforeGenerateDelegateRemoveParameter.java b/java/java-tests/testData/refactoring/introduceParameter/beforeGenerateDelegateRemoveParameter.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeGenerateDelegateRemoveParameter.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeGenerateDelegateRemoveParameter.java diff --git a/testData/refactoring/introduceParameter/beforeImplicitDefaultConstructor.java b/java/java-tests/testData/refactoring/introduceParameter/beforeImplicitDefaultConstructor.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeImplicitDefaultConstructor.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeImplicitDefaultConstructor.java diff --git a/testData/refactoring/introduceParameter/beforeImplicitSuperCall.java b/java/java-tests/testData/refactoring/introduceParameter/beforeImplicitSuperCall.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeImplicitSuperCall.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeImplicitSuperCall.java diff --git a/testData/refactoring/introduceParameter/beforeIncorrectScope.java b/java/java-tests/testData/refactoring/introduceParameter/beforeIncorrectScope.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeIncorrectScope.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeIncorrectScope.java diff --git a/testData/refactoring/introduceParameter/beforeInternalSideEffect.java b/java/java-tests/testData/refactoring/introduceParameter/beforeInternalSideEffect.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeInternalSideEffect.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeInternalSideEffect.java diff --git a/testData/refactoring/introduceParameter/beforeLocalVarDeclaration.java b/java/java-tests/testData/refactoring/introduceParameter/beforeLocalVarDeclaration.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeLocalVarDeclaration.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeLocalVarDeclaration.java diff --git a/testData/refactoring/introduceParameter/beforeLocalVarSelection.java b/java/java-tests/testData/refactoring/introduceParameter/beforeLocalVarSelection.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeLocalVarSelection.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeLocalVarSelection.java diff --git a/testData/refactoring/introduceParameter/beforeMethodAccess.java b/java/java-tests/testData/refactoring/introduceParameter/beforeMethodAccess.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeMethodAccess.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeMethodAccess.java diff --git a/testData/refactoring/introduceParameter/beforeMethodUsageInThisMethodInheritor.java b/java/java-tests/testData/refactoring/introduceParameter/beforeMethodUsageInThisMethodInheritor.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeMethodUsageInThisMethodInheritor.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeMethodUsageInThisMethodInheritor.java diff --git a/testData/refactoring/introduceParameter/beforeMethodWithoutParams.java b/java/java-tests/testData/refactoring/introduceParameter/beforeMethodWithoutParams.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeMethodWithoutParams.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeMethodWithoutParams.java diff --git a/testData/refactoring/introduceParameter/beforeNoUsages.java b/java/java-tests/testData/refactoring/introduceParameter/beforeNoUsages.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeNoUsages.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeNoUsages.java diff --git a/testData/refactoring/introduceParameter/beforeNull.java b/java/java-tests/testData/refactoring/introduceParameter/beforeNull.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeNull.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeNull.java diff --git a/testData/refactoring/introduceParameter/beforeParameterInFor.java b/java/java-tests/testData/refactoring/introduceParameter/beforeParameterInFor.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeParameterInFor.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeParameterInFor.java diff --git a/testData/refactoring/introduceParameter/beforeParameterJavaDoc1.java b/java/java-tests/testData/refactoring/introduceParameter/beforeParameterJavaDoc1.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeParameterJavaDoc1.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeParameterJavaDoc1.java diff --git a/testData/refactoring/introduceParameter/beforeParameterJavaDoc2.java b/java/java-tests/testData/refactoring/introduceParameter/beforeParameterJavaDoc2.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeParameterJavaDoc2.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeParameterJavaDoc2.java diff --git a/testData/refactoring/introduceParameter/beforeParameterJavaDoc3.java b/java/java-tests/testData/refactoring/introduceParameter/beforeParameterJavaDoc3.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeParameterJavaDoc3.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeParameterJavaDoc3.java diff --git a/testData/refactoring/introduceParameter/beforeParameterJavaDocBeforeVararg.java b/java/java-tests/testData/refactoring/introduceParameter/beforeParameterJavaDocBeforeVararg.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeParameterJavaDocBeforeVararg.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeParameterJavaDocBeforeVararg.java diff --git a/testData/refactoring/introduceParameter/beforeParameterSubstitution.java b/java/java-tests/testData/refactoring/introduceParameter/beforeParameterSubstitution.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeParameterSubstitution.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeParameterSubstitution.java diff --git a/testData/refactoring/introduceParameter/beforeQualifiedNew.java b/java/java-tests/testData/refactoring/introduceParameter/beforeQualifiedNew.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeQualifiedNew.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeQualifiedNew.java diff --git a/testData/refactoring/introduceParameter/beforeRemoveParameter.java b/java/java-tests/testData/refactoring/introduceParameter/beforeRemoveParameter.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeRemoveParameter.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeRemoveParameter.java diff --git a/testData/refactoring/introduceParameter/beforeRemoveParameterAfterVariable.java b/java/java-tests/testData/refactoring/introduceParameter/beforeRemoveParameterAfterVariable.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeRemoveParameterAfterVariable.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeRemoveParameterAfterVariable.java diff --git a/testData/refactoring/introduceParameter/beforeRemoveParameterInHierarchy.java b/java/java-tests/testData/refactoring/introduceParameter/beforeRemoveParameterInHierarchy.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeRemoveParameterInHierarchy.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeRemoveParameterInHierarchy.java diff --git a/testData/refactoring/introduceParameter/beforeRemoveParameterWithJavadoc.java b/java/java-tests/testData/refactoring/introduceParameter/beforeRemoveParameterWithJavadoc.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeRemoveParameterWithJavadoc.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeRemoveParameterWithJavadoc.java diff --git a/testData/refactoring/introduceParameter/beforeSimpleUsage.java b/java/java-tests/testData/refactoring/introduceParameter/beforeSimpleUsage.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeSimpleUsage.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeSimpleUsage.java diff --git a/testData/refactoring/introduceParameter/beforeStaticFieldAccess.java b/java/java-tests/testData/refactoring/introduceParameter/beforeStaticFieldAccess.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeStaticFieldAccess.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeStaticFieldAccess.java diff --git a/testData/refactoring/introduceParameter/beforeSuperInExpression.java b/java/java-tests/testData/refactoring/introduceParameter/beforeSuperInExpression.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeSuperInExpression.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeSuperInExpression.java diff --git a/testData/refactoring/introduceParameter/beforeSuperWithSideEffect.java b/java/java-tests/testData/refactoring/introduceParameter/beforeSuperWithSideEffect.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeSuperWithSideEffect.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeSuperWithSideEffect.java diff --git a/testData/refactoring/introduceParameter/beforeThisSubstitution.java b/java/java-tests/testData/refactoring/introduceParameter/beforeThisSubstitution.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeThisSubstitution.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeThisSubstitution.java diff --git a/testData/refactoring/introduceParameter/beforeThisSubstitutionInQualifier.java b/java/java-tests/testData/refactoring/introduceParameter/beforeThisSubstitutionInQualifier.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeThisSubstitutionInQualifier.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeThisSubstitutionInQualifier.java diff --git a/testData/refactoring/introduceParameter/beforeUseInInnerClass.java b/java/java-tests/testData/refactoring/introduceParameter/beforeUseInInnerClass.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeUseInInnerClass.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeUseInInnerClass.java diff --git a/testData/refactoring/introduceParameter/beforeVarargs.java b/java/java-tests/testData/refactoring/introduceParameter/beforeVarargs.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeVarargs.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeVarargs.java diff --git a/testData/refactoring/introduceParameter/beforeVarargs1.java b/java/java-tests/testData/refactoring/introduceParameter/beforeVarargs1.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeVarargs1.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeVarargs1.java diff --git a/testData/refactoring/introduceParameter/beforeWeirdQualifier.java b/java/java-tests/testData/refactoring/introduceParameter/beforeWeirdQualifier.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeWeirdQualifier.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeWeirdQualifier.java diff --git a/testData/refactoring/introduceParameter/beforeWeirdQualifierAndParameter.java b/java/java-tests/testData/refactoring/introduceParameter/beforeWeirdQualifierAndParameter.java similarity index 100% rename from testData/refactoring/introduceParameter/beforeWeirdQualifierAndParameter.java rename to java/java-tests/testData/refactoring/introduceParameter/beforeWeirdQualifierAndParameter.java diff --git a/refactoring/tests/com/intellij/refactoring/IntroduceParameterTest.java b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterTest.java similarity index 87% rename from refactoring/tests/com/intellij/refactoring/IntroduceParameterTest.java rename to java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterTest.java index 8fdc33873498..57738b8bcefa 100644 --- a/refactoring/tests/com/intellij/refactoring/IntroduceParameterTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterTest.java @@ -8,11 +8,9 @@ */ package com.intellij.refactoring; -import com.intellij.codeInsight.CodeInsightTestCase; +import com.intellij.JavaTestUtil; import com.intellij.codeInsight.CodeInsightUtil; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.roots.LanguageLevelProjectExtension; -import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiExpression; import com.intellij.psi.PsiLocalVariable; @@ -21,24 +19,17 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.introduceParameter.IntroduceParameterHandler; import com.intellij.refactoring.introduceParameter.IntroduceParameterProcessor; import com.intellij.refactoring.introduceParameter.Util; +import com.intellij.testFramework.LightCodeInsightTestCase; import gnu.trove.TIntArrayList; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; -public class IntroduceParameterTest extends CodeInsightTestCase { - private LanguageLevel myPreviousLanguageLevel; - - protected void setUp() throws Exception { - super.setUp(); - myPreviousLanguageLevel = LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).getLanguageLevel(); - LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5); +public class IntroduceParameterTest extends LightCodeInsightTestCase { + @Override + protected String getTestDataPath() { + return JavaTestUtil.getJavaTestDataPath(); } - - protected void tearDown() throws Exception { - LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(myPreviousLanguageLevel); - super.tearDown(); - } - + private void doTest(int replaceFieldsWithGetters, boolean removeUnusedParameters, boolean searchForSuper, boolean declareFinal, final boolean generateDelegate) throws Exception { configureByFile("/refactoring/introduceParameter/before" + getTestName(false) + ".java"); @@ -222,7 +213,7 @@ public class IntroduceParameterTest extends CodeInsightTestCase { private void doTestThroughHandler() throws Exception { configureByFile("/refactoring/introduceParameter/before" + getTestName(false) + ".java"); - new IntroduceParameterHandler().invoke(myProject, myEditor, myFile, new DataContext() { + new IntroduceParameterHandler().invoke(getProject(), myEditor, myFile, new DataContext() { @Nullable public Object getData(@NonNls final String dataId) { return null; @@ -231,13 +222,13 @@ public class IntroduceParameterTest extends CodeInsightTestCase { checkResultByFile("/refactoring/introduceParameter/after" + getTestName(false) + ".java"); } - private boolean perform(boolean replaceAllOccurences, - int replaceFieldsWithGetters, - @NonNls String parameterName, - boolean searchForSuper, - boolean declareFinal, - final boolean removeUnusedParameters, - final boolean generateDelegate) { + private static boolean perform(boolean replaceAllOccurences, + int replaceFieldsWithGetters, + @NonNls String parameterName, + boolean searchForSuper, + boolean declareFinal, + final boolean removeUnusedParameters, + final boolean generateDelegate) { int startOffset = myEditor.getSelectionModel().getSelectionStart(); int endOffset = myEditor.getSelectionModel().getSelectionEnd(); @@ -265,7 +256,7 @@ public class IntroduceParameterTest extends CodeInsightTestCase { PsiExpression initializer = expr == null ? localVariable.getInitializer() : expr; TIntArrayList parametersToRemove = removeUnusedParameters ? Util.findParametersToRemove(method, initializer) : new TIntArrayList(); new IntroduceParameterProcessor( - myProject, method, methodToSearchFor, initializer, expr, localVariable, true, parameterName, replaceAllOccurences, + getProject(), method, methodToSearchFor, initializer, expr, localVariable, true, parameterName, replaceAllOccurences, replaceFieldsWithGetters, declareFinal, generateDelegate, null, parametersToRemove).run(); @@ -273,8 +264,8 @@ public class IntroduceParameterTest extends CodeInsightTestCase { return true; } - private void performForLocal(boolean searchForSuper, boolean removeLocalVariable, boolean replaceAllOccurences, boolean declareFinal, - final boolean removeUnusedParameters) { + private static void performForLocal(boolean searchForSuper, boolean removeLocalVariable, boolean replaceAllOccurrences, boolean declareFinal, + final boolean removeUnusedParameters) { final int offset = myEditor.getCaretModel().getOffset(); final PsiElement element = myFile.findElementAt(offset).getParent(); assertTrue(element instanceof PsiLocalVariable); @@ -294,9 +285,9 @@ public class IntroduceParameterTest extends CodeInsightTestCase { TIntArrayList parametersToRemove = removeUnusedParameters ? Util.findParametersToRemove(method, parameterInitializer) : new TIntArrayList(); new IntroduceParameterProcessor( - myProject, method, methodToSearchFor, + getProject(), method, methodToSearchFor, parameterInitializer, null, localVariable, removeLocalVariable, - localVariable.getName(), replaceAllOccurences, + localVariable.getName(), replaceAllOccurrences, IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_INACCESSIBLE, declareFinal, false, null, parametersToRemove).run(); }