From 01617e9b80aedbdb702277522c5526dc3d5b93ea Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Tue, 7 Jan 2014 17:13:14 +0100 Subject: [PATCH] testall -> parameterized (I) --- .../quickFix/AccessStaticViaInstanceTest.java | 2 +- .../quickFix/AddAssertStatementFixTest.java | 3 +- .../quickFix/AddExceptionToCatchTest.java | 2 +- .../quickFix/AddExceptionToThrowsTest.java | 2 +- .../daemon/quickFix/AddMethodBodyTest.java | 3 +- .../quickFix/AddNewArrayExpressionTest.java | 2 +- .../daemon/quickFix/AddReturnTest.java | 3 +- .../daemon/quickFix/AddTypeCastTest.java | 2 +- .../quickFix/AddVariableInitializerTest.java | 2 +- .../Anonymous2LambdaInspectionTest.java | 2 +- ...onymous2MethodReferenceInspectionTest.java | 2 +- .../quickFix/BreakStringOnLineBreaksTest.java | 2 +- .../quickFix/BringVariableIntoScopeTest.java | 2 +- .../CastConstructorParametersTest.java | 3 +- .../quickFix/CastMethodParameters15Test.java | 3 +- .../quickFix/CastMethodParametersTest.java | 8 +- .../ChangeExtendsToImplementsTest.java | 9 +- .../ChangeMethodSignatureFromUsageTest.java | 9 +- .../quickFix/ChangeNewOperatorTypeTest.java | 8 +- .../quickFix/ChangeParameterClassTest.java | 14 +- ...geStringLiteralToCharInMethodCallTest.java | 2 +- .../daemon/quickFix/ChangeToAppendTest.java | 2 +- .../quickFix/ChangeTypeArgumentsFixTest.java | 9 +- .../ConvertColorRepresentationTest.java | 9 +- .../quickFix/ConvertDoubleToFloatFixTest.java | 9 +- .../quickFix/ConvertFieldToLocalTest.java | 2 +- .../quickFix/ConvertSwitchToIfTest.java | 2 +- .../CreateAnnotationMethodFromUsageTest.java | 8 +- .../CreateAnnotationTypeFromUsageTest.java | 2 +- .../quickFix/CreateClassFromNewTest.java | 9 +- .../quickFix/CreateClassFromUsageTest.java | 2 +- .../CreateConstructorFromCallTest.java | 2 +- .../CreateConstructorFromSuperTest.java | 2 +- .../CreateConstructorMatchingSuperTest.java | 2 +- ...eateConstructorParameterFromFieldTest.java | 2 +- .../CreateEnumConstantFromUsageTest.java | 8 +- .../quickFix/CreateGetterOrSetterTest.java | 2 +- .../quickFix/CreateInnerClassFromNewTest.java | 2 +- .../CreateInnerClassFromUsageTest.java | 2 +- .../quickFix/CreateLocalFromUsageTest.java | 2 +- .../CreateParameterFromUsageTest.java | 2 +- .../quickFix/CreatePropertyFromUsageTest.java | 8 +- .../quickFix/DeferFinalAssignmentTest.java | 3 +- .../DelegateWithDefaultParamValueTest.java | 2 +- .../daemon/quickFix/DeleteCatchTest.java | 2 +- .../daemon/quickFix/DeleteMultiCatchTest.java | 2 +- .../EnableOptimizeImportsOnTheFlyTest.java | 2 +- .../daemon/quickFix/FixAllQuickfixTest.java | 2 +- .../quickFix/FlipIntersectionTypesTest.java | 2 +- .../daemon/quickFix/GeneralizeCatchTest.java | 2 +- .../quickFix/GenericCreateFromUsageTest.java | 9 +- .../daemon/quickFix/I18nQuickFixTest.java | 8 +- ...tializeFinalFieldInConstructorFixTest.java | 2 +- .../daemon/quickFix/InsertNewTest.java | 2 +- .../daemon/quickFix/InsertSuperTest.java | 3 +- .../daemon/quickFix/IterateOverTest.java | 8 +- .../JavadocInspectionQuickFixTest.java | 7 +- .../Lambda2MethodReferenceInspectionTest.java | 2 +- .../quickFix/LightQuickFix15TestCase.java | 29 ---- .../LightQuickFixAvailabilityTestCase.java | 2 +- .../quickFix/MakeExtendsThrowableTest.java | 9 +- .../quickFix/MethodReturnBooleanTest.java | 2 +- .../daemon/quickFix/MethodReturnTest.java | 8 +- .../daemon/quickFix/MethodThrowsTest.java | 3 +- .../daemon/quickFix/Modifier18Test.java | 2 +- .../daemon/quickFix/ModifierTest.java | 2 +- .../quickFix/MoveBoundClassToFrontTest.java | 2 +- .../daemon/quickFix/MoveCatchUpTest.java | 3 +- .../quickFix/NegationBroadScopeTest.java | 2 +- .../daemon/quickFix/OverrideMethodTest.java | 9 +- .../daemon/quickFix/PermuteArgumentsTest.java | 2 +- .../quickFix/PushConditionInCallTest.java | 2 +- .../quickFix/QualifyThisArgumentFixTest.java | 2 +- .../quickFix/QualifyWithThisFixTest.java | 2 +- ...edundantLambdaCodeBlockInspectionTest.java | 2 +- ...ndantLambdaParameterTypeIntentionTest.java | 2 +- .../quickFix/RemoveNewQualifierTest.java | 3 +- .../daemon/quickFix/RemoveQualifierTest.java | 2 +- .../quickFix/RemoveRedundantArgumentTest.java | 2 +- .../RemoveRedundantElseActionTest.java | 2 +- ...moveRedundantUncheckedSuppressionTest.java | 2 +- .../quickFix/RemoveTypeArgumentsTest.java | 2 +- .../quickFix/RemoveUnusedParameterTest.java | 3 +- .../quickFix/RemoveUnusedVariableTest.java | 3 +- ...eplaceAddAllArrayToCollectionsFixTest.java | 2 +- ...ReplaceImplementsWithStaticImportTest.java | 2 +- ...ccessibleFieldWithGetterSetterFixTest.java | 2 +- .../ReplacePrimitiveWithBoxedTypeTest.java | 9 +- .../quickFix/ReplaceWithListAccessTest.java | 2 +- .../ReplaceWithTernaryOperatorTest.java | 2 +- .../ReuseVariableDeclarationTest.java | 2 +- .../quickFix/SafeVarargsCanBeUsedTest.java | 2 +- .../Simplify2DiamondInspectionsTest.java | 2 +- .../quickFix/StaticImportMethodTest.java | 9 +- .../quickFix/SuperMethodReturnTest.java | 3 +- .../quickFix/Suppress15InspectionsTest.java | 2 +- .../quickFix/SuppressLocalInspectionTest.java | 8 +- .../quickFix/SuppressNonInspectionsTest.java | 9 +- .../quickFix/SurroundWithArrayFixTest.java | 9 +- .../quickFix/SurroundWithIfFixTest.java | 2 +- .../quickFix/SurroundWithTryCatchTest.java | 2 +- .../quickFix/UnimplementIntentionTest.java | 2 +- .../VariableAccessFromInnerClass18Test.java | 2 +- .../quickFix/VariableArrayTypeTest.java | 2 +- .../VariableParameterizedTypeTest.java | 8 +- .../quickFix/VariableTypeFromCallTest.java | 2 +- .../daemon/quickFix/VariableTypeTest.java | 2 +- .../quickFix/WrapExpressionFixTest.java | 7 +- .../ConvertParameterToLocalVariableTest.java | 4 +- .../InlineSameParameterValueTest.java | 4 +- .../daemon/LightIntentionActionTestCase.java | 4 +- .../LightQuickFixParameterizedTestCase.java | 159 ++++++++++++++++++ .../quickFix/LightQuickFixTestCase.java | 20 ++- .../openapi/application/ex/PathManagerEx.java | 9 +- .../intellij/testFramework/Parameterized.java | 68 ++++++++ .../ig/inheritance/StaticInheritanceTest.java | 4 +- .../XmlWrongClosingTagNameInspectionTest.java | 4 +- .../FetchExternalResourcesFixTest.java | 2 +- .../IgnoreExternalResourcesFixTest.java | 2 +- ...ManuallySetupExternalResourcesFixTest.java | 2 +- 120 files changed, 515 insertions(+), 196 deletions(-) delete mode 100644 java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/LightQuickFix15TestCase.java create mode 100644 java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixParameterizedTestCase.java create mode 100644 platform/testFramework/src/com/intellij/testFramework/Parameterized.java diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AccessStaticViaInstanceTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AccessStaticViaInstanceTest.java index 23b49f3f98cf..82aa5086e73f 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AccessStaticViaInstanceTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AccessStaticViaInstanceTest.java @@ -19,7 +19,7 @@ import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.accessStaticViaInstance.AccessStaticViaInstance; import org.jetbrains.annotations.NotNull; -public class AccessStaticViaInstanceTest extends LightQuickFixTestCase { +public class AccessStaticViaInstanceTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected LocalInspectionTool[] configureLocalInspectionTools() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddAssertStatementFixTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddAssertStatementFixTest.java index f5ab11b79d0e..994bcfa43eb2 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddAssertStatementFixTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddAssertStatementFixTest.java @@ -22,10 +22,9 @@ package com.intellij.codeInsight.daemon.quickFix; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.dataFlow.DataFlowInspection; -import com.intellij.codeInspection.nullable.NullableStuffInspection; import org.jetbrains.annotations.NotNull; -public class AddAssertStatementFixTest extends LightQuickFixTestCase { +public class AddAssertStatementFixTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected LocalInspectionTool[] configureLocalInspectionTools() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddExceptionToCatchTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddExceptionToCatchTest.java index 2fdf1baa6d5f..4ef4c493e09d 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddExceptionToCatchTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddExceptionToCatchTest.java @@ -1,6 +1,6 @@ package com.intellij.codeInsight.daemon.quickFix; -public class AddExceptionToCatchTest extends LightQuickFixTestCase { +public class AddExceptionToCatchTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddExceptionToThrowsTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddExceptionToThrowsTest.java index 70e61dbdbed4..f25775fb962b 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddExceptionToThrowsTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddExceptionToThrowsTest.java @@ -1,6 +1,6 @@ package com.intellij.codeInsight.daemon.quickFix; -public class AddExceptionToThrowsTest extends LightQuickFixTestCase { +public class AddExceptionToThrowsTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddMethodBodyTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddMethodBodyTest.java index 1862adbc235f..86be608564f9 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddMethodBodyTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddMethodBodyTest.java @@ -1,9 +1,8 @@ - package com.intellij.codeInsight.daemon.quickFix; -public class AddMethodBodyTest extends LightQuickFixTestCase { +public class AddMethodBodyTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddNewArrayExpressionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddNewArrayExpressionTest.java index f89ddd0de58f..9db98944d15d 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddNewArrayExpressionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddNewArrayExpressionTest.java @@ -1,6 +1,6 @@ package com.intellij.codeInsight.daemon.quickFix; -public class AddNewArrayExpressionTest extends LightQuickFixTestCase { +public class AddNewArrayExpressionTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddReturnTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddReturnTest.java index 96beeedfbadf..456591f7e0f8 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddReturnTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddReturnTest.java @@ -1,7 +1,6 @@ - package com.intellij.codeInsight.daemon.quickFix; -public class AddReturnTest extends LightQuickFixTestCase { +public class AddReturnTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddTypeCastTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddTypeCastTest.java index d48013e634fa..c093f067822d 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddTypeCastTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddTypeCastTest.java @@ -15,7 +15,7 @@ */ package com.intellij.codeInsight.daemon.quickFix; -public class AddTypeCastTest extends LightQuickFixTestCase { +public class AddTypeCastTest extends LightQuickFixParameterizedTestCase { public void test() { doAllTests(); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddVariableInitializerTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddVariableInitializerTest.java index 01eb51aa7366..b4444e0559da 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddVariableInitializerTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddVariableInitializerTest.java @@ -1,6 +1,6 @@ package com.intellij.codeInsight.daemon.quickFix; -public class AddVariableInitializerTest extends LightQuickFixTestCase { +public class AddVariableInitializerTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Anonymous2LambdaInspectionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Anonymous2LambdaInspectionTest.java index c21eac60b308..4689fe1b0079 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Anonymous2LambdaInspectionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Anonymous2LambdaInspectionTest.java @@ -20,7 +20,7 @@ import com.intellij.codeInspection.LocalInspectionTool; import org.jetbrains.annotations.NotNull; -public class Anonymous2LambdaInspectionTest extends LightQuickFixTestCase { +public class Anonymous2LambdaInspectionTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected LocalInspectionTool[] configureLocalInspectionTools() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Anonymous2MethodReferenceInspectionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Anonymous2MethodReferenceInspectionTest.java index 402409c6f6c4..c41b99010b9e 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Anonymous2MethodReferenceInspectionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Anonymous2MethodReferenceInspectionTest.java @@ -20,7 +20,7 @@ import com.intellij.codeInspection.LocalInspectionTool; import org.jetbrains.annotations.NotNull; -public class Anonymous2MethodReferenceInspectionTest extends LightQuickFixTestCase { +public class Anonymous2MethodReferenceInspectionTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected LocalInspectionTool[] configureLocalInspectionTools() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/BreakStringOnLineBreaksTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/BreakStringOnLineBreaksTest.java index 946817269ae4..b69a4e8e1c08 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/BreakStringOnLineBreaksTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/BreakStringOnLineBreaksTest.java @@ -18,7 +18,7 @@ package com.intellij.codeInsight.daemon.quickFix; /** * @author Danila Ponomarenko */ -public class BreakStringOnLineBreaksTest extends LightQuickFixTestCase { +public class BreakStringOnLineBreaksTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/BringVariableIntoScopeTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/BringVariableIntoScopeTest.java index 76634010f4aa..b7db420c3c50 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/BringVariableIntoScopeTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/BringVariableIntoScopeTest.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.quickFix; /** * @author ven */ -public class BringVariableIntoScopeTest extends LightQuickFixTestCase { +public class BringVariableIntoScopeTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CastConstructorParametersTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CastConstructorParametersTest.java index 95398ecfe843..4ffcda2dd683 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CastConstructorParametersTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CastConstructorParametersTest.java @@ -1,9 +1,8 @@ - package com.intellij.codeInsight.daemon.quickFix; -public class CastConstructorParametersTest extends LightQuickFixTestCase { +public class CastConstructorParametersTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CastMethodParameters15Test.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CastMethodParameters15Test.java index ec217da6f289..a69da298c98a 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CastMethodParameters15Test.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CastMethodParameters15Test.java @@ -1,4 +1,3 @@ - /* * Copyright 2000-2013 JetBrains s.r.o. * @@ -16,7 +15,7 @@ */ package com.intellij.codeInsight.daemon.quickFix; -public class CastMethodParameters15Test extends LightQuickFixTestCase { +public class CastMethodParameters15Test extends LightQuickFixParameterizedTestCase { @Override protected void setUp() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CastMethodParametersTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CastMethodParametersTest.java index 5acb1fed0c8e..93f3ba270515 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CastMethodParametersTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CastMethodParametersTest.java @@ -1,15 +1,13 @@ - package com.intellij.codeInsight.daemon.quickFix; import com.intellij.openapi.roots.LanguageLevelProjectExtension; import com.intellij.pom.java.LanguageLevel; -public class CastMethodParametersTest extends LightQuickFixTestCase { +public class CastMethodParametersTest extends LightQuickFixParameterizedTestCase { @Override - protected void setUp() throws Exception { - super.setUp(); - LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.JDK_1_3); + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_3; } public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeExtendsToImplementsTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeExtendsToImplementsTest.java index ef876892f86f..05e43601e1ad 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeExtendsToImplementsTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeExtendsToImplementsTest.java @@ -1,11 +1,18 @@ package com.intellij.codeInsight.daemon.quickFix; -public class ChangeExtendsToImplementsTest extends LightQuickFix15TestCase { +import com.intellij.pom.java.LanguageLevel; + +public class ChangeExtendsToImplementsTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override protected String getBasePath() { return "/codeInsight/daemonCodeAnalyzer/quickFix/changeExtendsToImplements"; } + + @Override + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_5; + } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeMethodSignatureFromUsageTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeMethodSignatureFromUsageTest.java index ee03a40307c7..c48ccb4ff0c4 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeMethodSignatureFromUsageTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeMethodSignatureFromUsageTest.java @@ -1,9 +1,11 @@ package com.intellij.codeInsight.daemon.quickFix; +import com.intellij.pom.java.LanguageLevel; + /** * @author cdr */ -public class ChangeMethodSignatureFromUsageTest extends LightQuickFix15TestCase { +public class ChangeMethodSignatureFromUsageTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @@ -11,4 +13,9 @@ public class ChangeMethodSignatureFromUsageTest extends LightQuickFix15TestCase protected String getBasePath() { return "/codeInsight/daemonCodeAnalyzer/quickFix/changeMethodSignatureFromUsage"; } + + @Override + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_5; + } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeNewOperatorTypeTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeNewOperatorTypeTest.java index db262aa3696c..5ff85decb4d9 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeNewOperatorTypeTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeNewOperatorTypeTest.java @@ -2,10 +2,14 @@ package com.intellij.codeInsight.daemon.quickFix; import com.intellij.pom.java.LanguageLevel; -public class ChangeNewOperatorTypeTest extends LightQuickFixTestCase { +public class ChangeNewOperatorTypeTest extends LightQuickFixParameterizedTestCase { + + @Override + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_7; + } public void test() throws Exception { - setLanguageLevel(LanguageLevel.JDK_1_7); doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeParameterClassTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeParameterClassTest.java index 2814eb8b6b20..8e57f7e2c745 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeParameterClassTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeParameterClassTest.java @@ -1,16 +1,8 @@ - package com.intellij.codeInsight.daemon.quickFix; import com.intellij.pom.java.LanguageLevel; - - -public class ChangeParameterClassTest extends LightQuickFix15TestCase { - @Override - protected LanguageLevel getLanguageLevel() { - return LanguageLevel.JDK_1_5; - } - +public class ChangeParameterClassTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @@ -20,5 +12,9 @@ public class ChangeParameterClassTest extends LightQuickFix15TestCase { return "/codeInsight/daemonCodeAnalyzer/quickFix/changeParameterClass"; } + @Override + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_5; + } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeStringLiteralToCharInMethodCallTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeStringLiteralToCharInMethodCallTest.java index be2891a5e540..df95214cb17f 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeStringLiteralToCharInMethodCallTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeStringLiteralToCharInMethodCallTest.java @@ -1,6 +1,6 @@ package com.intellij.codeInsight.daemon.quickFix; -public class ChangeStringLiteralToCharInMethodCallTest extends LightQuickFixTestCase { +public class ChangeStringLiteralToCharInMethodCallTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeToAppendTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeToAppendTest.java index c7d1a7b7a237..53fa9786d56b 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeToAppendTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeToAppendTest.java @@ -1,6 +1,6 @@ package com.intellij.codeInsight.daemon.quickFix; -public class ChangeToAppendTest extends LightQuickFixTestCase { +public class ChangeToAppendTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeTypeArgumentsFixTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeTypeArgumentsFixTest.java index 7aa289c49cbf..5a064705795f 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeTypeArgumentsFixTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeTypeArgumentsFixTest.java @@ -15,7 +15,9 @@ */ package com.intellij.codeInsight.daemon.quickFix; -public class ChangeTypeArgumentsFixTest extends LightQuickFix15TestCase { +import com.intellij.pom.java.LanguageLevel; + +public class ChangeTypeArgumentsFixTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @@ -23,4 +25,9 @@ public class ChangeTypeArgumentsFixTest extends LightQuickFix15TestCase { protected String getBasePath() { return "/codeInsight/daemonCodeAnalyzer/quickFix/changeTypeArgs"; } + + @Override + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_5; + } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ConvertColorRepresentationTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ConvertColorRepresentationTest.java index a13f0781fc32..1107d110b532 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ConvertColorRepresentationTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ConvertColorRepresentationTest.java @@ -15,10 +15,12 @@ */ package com.intellij.codeInsight.daemon.quickFix; +import com.intellij.pom.java.LanguageLevel; + /** * @author Danila Ponomarenko */ -public class ConvertColorRepresentationTest extends LightQuickFix15TestCase { +public class ConvertColorRepresentationTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @@ -26,4 +28,9 @@ public class ConvertColorRepresentationTest extends LightQuickFix15TestCase { protected String getBasePath() { return "/codeInsight/daemonCodeAnalyzer/quickFix/convertColorRepresentation"; } + + @Override + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_5; + } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ConvertDoubleToFloatFixTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ConvertDoubleToFloatFixTest.java index 1f57ad9d67a7..00e5d83f9ceb 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ConvertDoubleToFloatFixTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ConvertDoubleToFloatFixTest.java @@ -15,10 +15,12 @@ */ package com.intellij.codeInsight.daemon.quickFix; +import com.intellij.pom.java.LanguageLevel; + /** * @author cdr */ -public class ConvertDoubleToFloatFixTest extends LightQuickFix15TestCase { +public class ConvertDoubleToFloatFixTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @@ -26,4 +28,9 @@ public class ConvertDoubleToFloatFixTest extends LightQuickFix15TestCase { protected String getBasePath() { return "/codeInsight/daemonCodeAnalyzer/quickFix/convertDoubleToFloat"; } + + @Override + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_5; + } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ConvertFieldToLocalTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ConvertFieldToLocalTest.java index d74b67fe3e91..5e8879aa37c1 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ConvertFieldToLocalTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ConvertFieldToLocalTest.java @@ -20,7 +20,7 @@ import com.intellij.codeInspection.varScopeCanBeNarrowed.FieldCanBeLocalInspecti import org.jetbrains.annotations.NotNull; -public class ConvertFieldToLocalTest extends LightQuickFixTestCase { +public class ConvertFieldToLocalTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected LocalInspectionTool[] configureLocalInspectionTools() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ConvertSwitchToIfTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ConvertSwitchToIfTest.java index 1d7123e4a132..7a962cc557d3 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ConvertSwitchToIfTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ConvertSwitchToIfTest.java @@ -15,7 +15,7 @@ */ package com.intellij.codeInsight.daemon.quickFix; -public class ConvertSwitchToIfTest extends LightQuickFixTestCase { +public class ConvertSwitchToIfTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateAnnotationMethodFromUsageTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateAnnotationMethodFromUsageTest.java index 684c27d1be6b..5e01d3cbeb33 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateAnnotationMethodFromUsageTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateAnnotationMethodFromUsageTest.java @@ -15,7 +15,9 @@ */ package com.intellij.codeInsight.daemon.quickFix; -public class CreateAnnotationMethodFromUsageTest extends LightQuickFix15TestCase { +import com.intellij.pom.java.LanguageLevel; + +public class CreateAnnotationMethodFromUsageTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override @@ -23,4 +25,8 @@ public class CreateAnnotationMethodFromUsageTest extends LightQuickFix15TestCase return "/codeInsight/daemonCodeAnalyzer/quickFix/createAnnotationMethodFromUsage"; } + @Override + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_5; + } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateAnnotationTypeFromUsageTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateAnnotationTypeFromUsageTest.java index 969e27e7c73d..5a85f95401cb 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateAnnotationTypeFromUsageTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateAnnotationTypeFromUsageTest.java @@ -18,7 +18,7 @@ package com.intellij.codeInsight.daemon.quickFix; /** * @author ven */ -public class CreateAnnotationTypeFromUsageTest extends LightQuickFixTestCase{ +public class CreateAnnotationTypeFromUsageTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateClassFromNewTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateClassFromNewTest.java index 82fcd0e2e466..bf3e9a52318d 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateClassFromNewTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateClassFromNewTest.java @@ -20,9 +20,14 @@ import com.intellij.psi.codeStyle.CodeStyleSettingsManager; /** * @author ven */ -public class CreateClassFromNewTest extends LightQuickFixTestCase { - public void test() throws Exception { +public class CreateClassFromNewTest extends LightQuickFixParameterizedTestCase { + @Override + protected void setUp() throws Exception { + super.setUp(); CodeStyleSettingsManager.getSettings(getProject()).SPACE_BEFORE_CLASS_LBRACE = true; + } + + public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateClassFromUsageTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateClassFromUsageTest.java index 0732ca3584a6..2855c4588dcb 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateClassFromUsageTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateClassFromUsageTest.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.quickFix; /** * @author ven */ -public class CreateClassFromUsageTest extends LightQuickFixTestCase{ +public class CreateClassFromUsageTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateConstructorFromCallTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateConstructorFromCallTest.java index 96b7e6bcd82b..a4619adf0f40 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateConstructorFromCallTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateConstructorFromCallTest.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.quickFix; /** * @author ven */ -public class CreateConstructorFromCallTest extends LightQuickFixTestCase { +public class CreateConstructorFromCallTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateConstructorFromSuperTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateConstructorFromSuperTest.java index 7020d4a3b999..023f4b476735 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateConstructorFromSuperTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateConstructorFromSuperTest.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.quickFix; /** * @author ven */ -public class CreateConstructorFromSuperTest extends LightQuickFixTestCase { +public class CreateConstructorFromSuperTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateConstructorMatchingSuperTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateConstructorMatchingSuperTest.java index 13d5b7b0ff0e..2fca61cafdb3 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateConstructorMatchingSuperTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateConstructorMatchingSuperTest.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.quickFix; /** * @author ven */ -public class CreateConstructorMatchingSuperTest extends LightQuickFixTestCase { +public class CreateConstructorMatchingSuperTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateConstructorParameterFromFieldTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateConstructorParameterFromFieldTest.java index 94f8a9c65ce8..63fc95eb081e 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateConstructorParameterFromFieldTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateConstructorParameterFromFieldTest.java @@ -7,7 +7,7 @@ import org.jetbrains.annotations.NotNull; /** * @author cdr */ -public class CreateConstructorParameterFromFieldTest extends LightQuickFixTestCase { +public class CreateConstructorParameterFromFieldTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected LocalInspectionTool[] configureLocalInspectionTools() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateEnumConstantFromUsageTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateEnumConstantFromUsageTest.java index 01dff2883ff0..ca5ccc9dab5d 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateEnumConstantFromUsageTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateEnumConstantFromUsageTest.java @@ -1,9 +1,11 @@ package com.intellij.codeInsight.daemon.quickFix; +import com.intellij.pom.java.LanguageLevel; + /** * @author ven */ -public class CreateEnumConstantFromUsageTest extends LightQuickFix15TestCase{ +public class CreateEnumConstantFromUsageTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @@ -12,4 +14,8 @@ public class CreateEnumConstantFromUsageTest extends LightQuickFix15TestCase{ return "/codeInsight/daemonCodeAnalyzer/quickFix/createEnumConstantFromUsage"; } + @Override + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_5; + } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateGetterOrSetterTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateGetterOrSetterTest.java index 41372397f0e1..0f673656d9b2 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateGetterOrSetterTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateGetterOrSetterTest.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull; /** * @author Danila Ponomarenko */ -public class CreateGetterOrSetterTest extends LightQuickFixTestCase { +public class CreateGetterOrSetterTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected LocalInspectionTool[] configureLocalInspectionTools() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateInnerClassFromNewTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateInnerClassFromNewTest.java index 7b53bd1505ae..2fc498cc01c7 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateInnerClassFromNewTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateInnerClassFromNewTest.java @@ -18,7 +18,7 @@ package com.intellij.codeInsight.daemon.quickFix; /** * @author yole */ -public class CreateInnerClassFromNewTest extends LightQuickFixTestCase { +public class CreateInnerClassFromNewTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateInnerClassFromUsageTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateInnerClassFromUsageTest.java index e088ea531e8d..7f420dc2aeab 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateInnerClassFromUsageTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateInnerClassFromUsageTest.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.quickFix; /** * @author ven */ -public class CreateInnerClassFromUsageTest extends LightQuickFixTestCase{ +public class CreateInnerClassFromUsageTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateLocalFromUsageTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateLocalFromUsageTest.java index b529288278a9..bbfb138785ca 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateLocalFromUsageTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateLocalFromUsageTest.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.quickFix; /** * @author ven */ -public class CreateLocalFromUsageTest extends LightQuickFixTestCase { +public class CreateLocalFromUsageTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateParameterFromUsageTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateParameterFromUsageTest.java index 73c5cd27526f..4f50040dde40 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateParameterFromUsageTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateParameterFromUsageTest.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.quickFix; /** * @author ven */ -public class CreateParameterFromUsageTest extends LightQuickFixTestCase{ +public class CreateParameterFromUsageTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreatePropertyFromUsageTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreatePropertyFromUsageTest.java index 0ad725221a2e..1aede5527737 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreatePropertyFromUsageTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreatePropertyFromUsageTest.java @@ -15,7 +15,9 @@ */ package com.intellij.codeInsight.daemon.quickFix; -public class CreatePropertyFromUsageTest extends LightQuickFix15TestCase { +import com.intellij.pom.java.LanguageLevel; + +public class CreatePropertyFromUsageTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override @@ -23,4 +25,8 @@ public class CreatePropertyFromUsageTest extends LightQuickFix15TestCase { return "/codeInsight/daemonCodeAnalyzer/quickFix/createPropertyFromUsage"; } + @Override + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_5; + } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/DeferFinalAssignmentTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/DeferFinalAssignmentTest.java index 2b5aeade3cbe..5064fec192ef 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/DeferFinalAssignmentTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/DeferFinalAssignmentTest.java @@ -1,9 +1,8 @@ - package com.intellij.codeInsight.daemon.quickFix; -public class DeferFinalAssignmentTest extends LightQuickFixTestCase { +public class DeferFinalAssignmentTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/DelegateWithDefaultParamValueTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/DelegateWithDefaultParamValueTest.java index fa38ee78500f..c53bb0085d87 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/DelegateWithDefaultParamValueTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/DelegateWithDefaultParamValueTest.java @@ -21,7 +21,7 @@ import com.intellij.codeInsight.template.impl.TemplateState; /** * @author anna */ -public class DelegateWithDefaultParamValueTest extends LightQuickFixTestCase { +public class DelegateWithDefaultParamValueTest extends LightQuickFixParameterizedTestCase { @Override protected void doAction(String text, boolean actionShouldBeAvailable, String testFullPath, String testName) throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/DeleteCatchTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/DeleteCatchTest.java index 7fd7a71c5c6d..ec78fc3dbb30 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/DeleteCatchTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/DeleteCatchTest.java @@ -1,6 +1,6 @@ package com.intellij.codeInsight.daemon.quickFix; -public class DeleteCatchTest extends LightQuickFixTestCase { +public class DeleteCatchTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/DeleteMultiCatchTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/DeleteMultiCatchTest.java index b8d0c02269de..3f4f78dda0a5 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/DeleteMultiCatchTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/DeleteMultiCatchTest.java @@ -15,7 +15,7 @@ */ package com.intellij.codeInsight.daemon.quickFix; -public class DeleteMultiCatchTest extends LightQuickFixTestCase { +public class DeleteMultiCatchTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/EnableOptimizeImportsOnTheFlyTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/EnableOptimizeImportsOnTheFlyTest.java index 3da506a90583..8ebc9aa663e9 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/EnableOptimizeImportsOnTheFlyTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/EnableOptimizeImportsOnTheFlyTest.java @@ -7,7 +7,7 @@ import com.intellij.codeInspection.unusedImport.UnusedImportLocalInspection; import org.jetbrains.annotations.NotNull; -public class EnableOptimizeImportsOnTheFlyTest extends LightQuickFixTestCase { +public class EnableOptimizeImportsOnTheFlyTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected LocalInspectionTool[] configureLocalInspectionTools() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/FixAllQuickfixTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/FixAllQuickfixTest.java index 3cfb844aaaee..74563a0b3f22 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/FixAllQuickfixTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/FixAllQuickfixTest.java @@ -9,7 +9,7 @@ import com.intellij.codeInspection.dataFlow.DataFlowInspection; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -public class FixAllQuickfixTest extends LightQuickFixTestCase { +public class FixAllQuickfixTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected LocalInspectionTool[] configureLocalInspectionTools() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/FlipIntersectionTypesTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/FlipIntersectionTypesTest.java index ddd8ce49bc9a..a3501db8ddb2 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/FlipIntersectionTypesTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/FlipIntersectionTypesTest.java @@ -15,7 +15,7 @@ */ package com.intellij.codeInsight.daemon.quickFix; -public class FlipIntersectionTypesTest extends LightQuickFixTestCase { +public class FlipIntersectionTypesTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/GeneralizeCatchTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/GeneralizeCatchTest.java index 08678c9b6733..ac0c5b4ae09e 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/GeneralizeCatchTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/GeneralizeCatchTest.java @@ -1,6 +1,6 @@ package com.intellij.codeInsight.daemon.quickFix; -public class GeneralizeCatchTest extends LightQuickFixTestCase { +public class GeneralizeCatchTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/GenericCreateFromUsageTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/GenericCreateFromUsageTest.java index 124ea581cc3c..72e724ef9db2 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/GenericCreateFromUsageTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/GenericCreateFromUsageTest.java @@ -1,9 +1,11 @@ package com.intellij.codeInsight.daemon.quickFix; +import com.intellij.pom.java.LanguageLevel; + /** * @author ven */ -public class GenericCreateFromUsageTest extends LightQuickFix15TestCase { +public class GenericCreateFromUsageTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @@ -11,4 +13,9 @@ public class GenericCreateFromUsageTest extends LightQuickFix15TestCase { protected String getBasePath() { return "/codeInsight/daemonCodeAnalyzer/quickFix/genericCreateFromUsage"; } + + @Override + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_5; + } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/I18nQuickFixTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/I18nQuickFixTest.java index 9a9a3c66644d..f5994cd6b775 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/I18nQuickFixTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/I18nQuickFixTest.java @@ -18,12 +18,13 @@ package com.intellij.codeInsight.daemon.quickFix; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.i18n.I18nInspection; import com.intellij.openapi.util.Comparing; +import com.intellij.pom.java.LanguageLevel; import org.jetbrains.annotations.NotNull; /** * @author yole */ -public class I18nQuickFixTest extends LightQuickFix15TestCase { +public class I18nQuickFixTest extends LightQuickFixParameterizedTestCase { private boolean myMustBeAvailableAfterInvoke; @NotNull @@ -50,4 +51,9 @@ public class I18nQuickFixTest extends LightQuickFix15TestCase { protected boolean shouldBeAvailableAfterExecution() { return myMustBeAvailableAfterInvoke; } + + @Override + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_5; + } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/InitializeFinalFieldInConstructorFixTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/InitializeFinalFieldInConstructorFixTest.java index 4b3c868eabce..ac7bba98a7f6 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/InitializeFinalFieldInConstructorFixTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/InitializeFinalFieldInConstructorFixTest.java @@ -4,7 +4,7 @@ import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.unusedSymbol.UnusedSymbolLocalInspection; import org.jetbrains.annotations.NotNull; -public class InitializeFinalFieldInConstructorFixTest extends LightQuickFixTestCase { +public class InitializeFinalFieldInConstructorFixTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected LocalInspectionTool[] configureLocalInspectionTools() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/InsertNewTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/InsertNewTest.java index c23e7cbb8174..9eaa00dcc0d2 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/InsertNewTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/InsertNewTest.java @@ -1,6 +1,6 @@ package com.intellij.codeInsight.daemon.quickFix; -public class InsertNewTest extends LightQuickFixTestCase { +public class InsertNewTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/InsertSuperTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/InsertSuperTest.java index 373c03914080..8c9ef4a1365d 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/InsertSuperTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/InsertSuperTest.java @@ -1,9 +1,8 @@ - package com.intellij.codeInsight.daemon.quickFix; -public class InsertSuperTest extends LightQuickFixTestCase { +public class InsertSuperTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/IterateOverTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/IterateOverTest.java index 17cf0dd8566c..3fa220469e97 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/IterateOverTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/IterateOverTest.java @@ -1,4 +1,3 @@ - /* * Copyright 2000-2012 JetBrains s.r.o. * @@ -17,8 +16,9 @@ package com.intellij.codeInsight.daemon.quickFix; +import com.intellij.pom.java.LanguageLevel; -public class IterateOverTest extends LightQuickFix15TestCase { +public class IterateOverTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @@ -27,5 +27,9 @@ public class IterateOverTest extends LightQuickFix15TestCase { return "/codeInsight/daemonCodeAnalyzer/quickFix/iterateOver"; } + @Override + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_5; + } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/JavadocInspectionQuickFixTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/JavadocInspectionQuickFixTest.java index 17e729ebee42..0dd109f4273d 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/JavadocInspectionQuickFixTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/JavadocInspectionQuickFixTest.java @@ -12,9 +12,10 @@ package com.intellij.codeInsight.daemon.quickFix; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.javaDoc.JavaDocLocalInspection; +import com.intellij.pom.java.LanguageLevel; import org.jetbrains.annotations.NotNull; -public class JavadocInspectionQuickFixTest extends LightQuickFix15TestCase { +public class JavadocInspectionQuickFixTest extends LightQuickFixParameterizedTestCase { @NotNull @Override @@ -38,4 +39,8 @@ public class JavadocInspectionQuickFixTest extends LightQuickFix15TestCase { return "/codeInsight/daemonCodeAnalyzer/quickFix/javadocTags"; } + @Override + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_5; + } } \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Lambda2MethodReferenceInspectionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Lambda2MethodReferenceInspectionTest.java index 50de13539b26..2bbe041b8fbb 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Lambda2MethodReferenceInspectionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Lambda2MethodReferenceInspectionTest.java @@ -20,7 +20,7 @@ import com.intellij.codeInspection.LocalInspectionTool; import org.jetbrains.annotations.NotNull; -public class Lambda2MethodReferenceInspectionTest extends LightQuickFixTestCase { +public class Lambda2MethodReferenceInspectionTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected LocalInspectionTool[] configureLocalInspectionTools() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/LightQuickFix15TestCase.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/LightQuickFix15TestCase.java deleted file mode 100644 index 63e01f34f60a..000000000000 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/LightQuickFix15TestCase.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2000-2013 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.codeInsight.daemon.quickFix; - -import com.intellij.pom.java.LanguageLevel; - -/** - * @author ven - */ -public abstract class LightQuickFix15TestCase extends LightQuickFixTestCase { - @Override - protected void doAllTests() { - setLanguageLevel(LanguageLevel.JDK_1_5); - super.doAllTests(); - } -} diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/LightQuickFixAvailabilityTestCase.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/LightQuickFixAvailabilityTestCase.java index 58a3dac3d303..d000a8024185 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/LightQuickFixAvailabilityTestCase.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/LightQuickFixAvailabilityTestCase.java @@ -6,7 +6,7 @@ import com.intellij.codeInsight.intention.IntentionAction; * tests corresponding intention for availability only, does not invoke action * @author cdr */ -public abstract class LightQuickFixAvailabilityTestCase extends LightQuickFixTestCase { +public abstract class LightQuickFixAvailabilityTestCase extends LightQuickFixParameterizedTestCase { @Override protected void doAction(final String text, final boolean actionShouldBeAvailable, final String testFullPath, final String testName) throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MakeExtendsThrowableTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MakeExtendsThrowableTest.java index 76d9687b1dcb..7522d18e8519 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MakeExtendsThrowableTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MakeExtendsThrowableTest.java @@ -15,12 +15,19 @@ */ package com.intellij.codeInsight.daemon.quickFix; -public class MakeExtendsThrowableTest extends LightQuickFix15TestCase { +import com.intellij.pom.java.LanguageLevel; + +public class MakeExtendsThrowableTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override protected String getBasePath() { return "/codeInsight/daemonCodeAnalyzer/quickFix/makeExtendsThrowable"; } + + @Override + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_5; + } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MethodReturnBooleanTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MethodReturnBooleanTest.java index 84e9c33c29b6..eba46465710b 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MethodReturnBooleanTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MethodReturnBooleanTest.java @@ -1,6 +1,6 @@ package com.intellij.codeInsight.daemon.quickFix; -public class MethodReturnBooleanTest extends LightQuickFixTestCase { +public class MethodReturnBooleanTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MethodReturnTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MethodReturnTest.java index 0d76f37ebca5..b125ee647fc3 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MethodReturnTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MethodReturnTest.java @@ -1,9 +1,9 @@ - package com.intellij.codeInsight.daemon.quickFix; +import com.intellij.pom.java.LanguageLevel; -public class MethodReturnTest extends LightQuickFix15TestCase { +public class MethodReturnTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @@ -12,5 +12,9 @@ public class MethodReturnTest extends LightQuickFix15TestCase { return "/codeInsight/daemonCodeAnalyzer/quickFix/methodReturn"; } + @Override + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_5; + } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MethodThrowsTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MethodThrowsTest.java index 5ea75661258a..4009bde04d2f 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MethodThrowsTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MethodThrowsTest.java @@ -1,4 +1,3 @@ - package com.intellij.codeInsight.daemon.quickFix; import com.intellij.codeInspection.LocalInspectionTool; @@ -6,7 +5,7 @@ import com.intellij.codeInspection.unneededThrows.RedundantThrowsDeclaration; import org.jetbrains.annotations.NotNull; -public class MethodThrowsTest extends LightQuickFixTestCase { +public class MethodThrowsTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected LocalInspectionTool[] configureLocalInspectionTools() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Modifier18Test.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Modifier18Test.java index 7e614b74738c..535bedf9f916 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Modifier18Test.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Modifier18Test.java @@ -15,7 +15,7 @@ */ package com.intellij.codeInsight.daemon.quickFix; -public class Modifier18Test extends LightQuickFixTestCase { +public class Modifier18Test extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ModifierTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ModifierTest.java index 6c578808307a..7f66f3fd0d55 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ModifierTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ModifierTest.java @@ -2,7 +2,7 @@ package com.intellij.codeInsight.daemon.quickFix; import com.intellij.pom.java.LanguageLevel; -public class ModifierTest extends LightQuickFixTestCase { +public class ModifierTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MoveBoundClassToFrontTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MoveBoundClassToFrontTest.java index 215d24a41be6..0b5ac1f9f2b3 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MoveBoundClassToFrontTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MoveBoundClassToFrontTest.java @@ -1,6 +1,6 @@ package com.intellij.codeInsight.daemon.quickFix; -public class MoveBoundClassToFrontTest extends LightQuickFixTestCase { +public class MoveBoundClassToFrontTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MoveCatchUpTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MoveCatchUpTest.java index 3c15ab13ddca..9b84e44bf7e5 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MoveCatchUpTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MoveCatchUpTest.java @@ -1,7 +1,6 @@ - package com.intellij.codeInsight.daemon.quickFix; -public class MoveCatchUpTest extends LightQuickFixTestCase { +public class MoveCatchUpTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/NegationBroadScopeTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/NegationBroadScopeTest.java index bbe7511c7c33..acb8a0a5c053 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/NegationBroadScopeTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/NegationBroadScopeTest.java @@ -1,6 +1,6 @@ package com.intellij.codeInsight.daemon.quickFix; -public class NegationBroadScopeTest extends LightQuickFixTestCase { +public class NegationBroadScopeTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/OverrideMethodTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/OverrideMethodTest.java index cb27ee09306d..b36f62fe3f0b 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/OverrideMethodTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/OverrideMethodTest.java @@ -1,4 +1,3 @@ - /* * Copyright 2000-2012 JetBrains s.r.o. * @@ -16,7 +15,9 @@ */ package com.intellij.codeInsight.daemon.quickFix; -public class OverrideMethodTest extends LightQuickFix15TestCase { +import com.intellij.pom.java.LanguageLevel; + +public class OverrideMethodTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); @@ -27,5 +28,9 @@ public class OverrideMethodTest extends LightQuickFix15TestCase { return "/codeInsight/daemonCodeAnalyzer/quickFix/overrideMethod"; } + @Override + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_5; + } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/PermuteArgumentsTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/PermuteArgumentsTest.java index 8093aa9ff558..ca4e77d31197 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/PermuteArgumentsTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/PermuteArgumentsTest.java @@ -1,6 +1,6 @@ package com.intellij.codeInsight.daemon.quickFix; -public class PermuteArgumentsTest extends LightQuickFixTestCase { +public class PermuteArgumentsTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/PushConditionInCallTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/PushConditionInCallTest.java index b80d4a9d08ae..0231d3006bcc 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/PushConditionInCallTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/PushConditionInCallTest.java @@ -15,7 +15,7 @@ */ package com.intellij.codeInsight.daemon.quickFix; -public class PushConditionInCallTest extends LightQuickFixTestCase{ +public class PushConditionInCallTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/QualifyThisArgumentFixTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/QualifyThisArgumentFixTest.java index c92cb1f5c1c2..4a02b66e13be 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/QualifyThisArgumentFixTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/QualifyThisArgumentFixTest.java @@ -15,7 +15,7 @@ */ package com.intellij.codeInsight.daemon.quickFix; -public class QualifyThisArgumentFixTest extends LightQuickFixTestCase { +public class QualifyThisArgumentFixTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/QualifyWithThisFixTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/QualifyWithThisFixTest.java index 1e8d2ede18e2..5ea6571c1f84 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/QualifyWithThisFixTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/QualifyWithThisFixTest.java @@ -18,7 +18,7 @@ package com.intellij.codeInsight.daemon.quickFix; /** * @author anna */ -public class QualifyWithThisFixTest extends LightQuickFixTestCase { +public class QualifyWithThisFixTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RedundantLambdaCodeBlockInspectionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RedundantLambdaCodeBlockInspectionTest.java index b5ed93893702..4c298cacdd44 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RedundantLambdaCodeBlockInspectionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RedundantLambdaCodeBlockInspectionTest.java @@ -20,7 +20,7 @@ import com.intellij.codeInspection.RedundantLambdaCodeBlockInspection; import org.jetbrains.annotations.NotNull; -public class RedundantLambdaCodeBlockInspectionTest extends LightQuickFixTestCase { +public class RedundantLambdaCodeBlockInspectionTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected LocalInspectionTool[] configureLocalInspectionTools() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RedundantLambdaParameterTypeIntentionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RedundantLambdaParameterTypeIntentionTest.java index 84bdbc64887d..e9b9645b05ee 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RedundantLambdaParameterTypeIntentionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RedundantLambdaParameterTypeIntentionTest.java @@ -15,7 +15,7 @@ */ package com.intellij.codeInsight.daemon.quickFix; -public class RedundantLambdaParameterTypeIntentionTest extends LightQuickFixTestCase { +public class RedundantLambdaParameterTypeIntentionTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveNewQualifierTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveNewQualifierTest.java index 327fc71a309a..5da1d3db558b 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveNewQualifierTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveNewQualifierTest.java @@ -1,9 +1,8 @@ - package com.intellij.codeInsight.daemon.quickFix; -public class RemoveNewQualifierTest extends LightQuickFixTestCase { +public class RemoveNewQualifierTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveQualifierTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveQualifierTest.java index 5d0bb62af057..9b1380962010 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveQualifierTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveQualifierTest.java @@ -1,6 +1,6 @@ package com.intellij.codeInsight.daemon.quickFix; -public class RemoveQualifierTest extends LightQuickFixTestCase { +public class RemoveQualifierTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveRedundantArgumentTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveRedundantArgumentTest.java index 2930d5d42571..e9b75eaa7c76 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveRedundantArgumentTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveRedundantArgumentTest.java @@ -1,6 +1,6 @@ package com.intellij.codeInsight.daemon.quickFix; -public class RemoveRedundantArgumentTest extends LightQuickFixTestCase { +public class RemoveRedundantArgumentTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveRedundantElseActionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveRedundantElseActionTest.java index ac465b18a6ed..0a33ada748f8 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveRedundantElseActionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveRedundantElseActionTest.java @@ -19,7 +19,7 @@ package com.intellij.codeInsight.daemon.quickFix; * User: anna * Date: Aug 30, 2010 */ -public class RemoveRedundantElseActionTest extends LightQuickFixTestCase { +public class RemoveRedundantElseActionTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveRedundantUncheckedSuppressionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveRedundantUncheckedSuppressionTest.java index 4afe45903fcc..80b5f6256dd4 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveRedundantUncheckedSuppressionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveRedundantUncheckedSuppressionTest.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; -public class RemoveRedundantUncheckedSuppressionTest extends LightQuickFixTestCase { +public class RemoveRedundantUncheckedSuppressionTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected LocalInspectionTool[] configureLocalInspectionTools() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveTypeArgumentsTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveTypeArgumentsTest.java index cd1a096e0d96..f608409359d6 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveTypeArgumentsTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveTypeArgumentsTest.java @@ -15,7 +15,7 @@ */ package com.intellij.codeInsight.daemon.quickFix; -public class RemoveTypeArgumentsTest extends LightQuickFixTestCase { +public class RemoveTypeArgumentsTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveUnusedParameterTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveUnusedParameterTest.java index fd6afa2fbadf..6ca1ef6188e9 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveUnusedParameterTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveUnusedParameterTest.java @@ -1,4 +1,3 @@ - package com.intellij.codeInsight.daemon.quickFix; import com.intellij.codeInspection.LocalInspectionTool; @@ -6,7 +5,7 @@ import com.intellij.codeInspection.unusedSymbol.UnusedSymbolLocalInspection; import org.jetbrains.annotations.NotNull; -public class RemoveUnusedParameterTest extends LightQuickFixTestCase { +public class RemoveUnusedParameterTest extends LightQuickFixParameterizedTestCase { @NotNull diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveUnusedVariableTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveUnusedVariableTest.java index 41b0863ac461..e9c74a04d4ff 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveUnusedVariableTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/RemoveUnusedVariableTest.java @@ -1,11 +1,10 @@ - package com.intellij.codeInsight.daemon.quickFix; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.unusedSymbol.UnusedSymbolLocalInspection; import org.jetbrains.annotations.NotNull; -public class RemoveUnusedVariableTest extends LightQuickFixTestCase { +public class RemoveUnusedVariableTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected LocalInspectionTool[] configureLocalInspectionTools() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceAddAllArrayToCollectionsFixTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceAddAllArrayToCollectionsFixTest.java index 47d7f35b91eb..79e6e0ef3d6c 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceAddAllArrayToCollectionsFixTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceAddAllArrayToCollectionsFixTest.java @@ -20,7 +20,7 @@ */ package com.intellij.codeInsight.daemon.quickFix; -public class ReplaceAddAllArrayToCollectionsFixTest extends LightQuickFixTestCase { +public class ReplaceAddAllArrayToCollectionsFixTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceImplementsWithStaticImportTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceImplementsWithStaticImportTest.java index cf37964d997a..cfbc836e6ee4 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceImplementsWithStaticImportTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceImplementsWithStaticImportTest.java @@ -23,7 +23,7 @@ package com.intellij.codeInsight.daemon.quickFix; import com.intellij.JavaTestUtil; import org.jetbrains.annotations.NotNull; -public class ReplaceImplementsWithStaticImportTest extends LightQuickFixTestCase { +public class ReplaceImplementsWithStaticImportTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected String getTestDataPath() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceInaccessibleFieldWithGetterSetterFixTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceInaccessibleFieldWithGetterSetterFixTest.java index 426a7714bbdf..fc520a31d4da 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceInaccessibleFieldWithGetterSetterFixTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceInaccessibleFieldWithGetterSetterFixTest.java @@ -15,7 +15,7 @@ */ package com.intellij.codeInsight.daemon.quickFix; -public class ReplaceInaccessibleFieldWithGetterSetterFixTest extends LightQuickFixTestCase { +public class ReplaceInaccessibleFieldWithGetterSetterFixTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplacePrimitiveWithBoxedTypeTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplacePrimitiveWithBoxedTypeTest.java index 2784185cb42b..75988eff4d4f 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplacePrimitiveWithBoxedTypeTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplacePrimitiveWithBoxedTypeTest.java @@ -15,12 +15,19 @@ */ package com.intellij.codeInsight.daemon.quickFix; -public class ReplacePrimitiveWithBoxedTypeTest extends LightQuickFix15TestCase { +import com.intellij.pom.java.LanguageLevel; + +public class ReplacePrimitiveWithBoxedTypeTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override protected String getBasePath() { return "/codeInsight/daemonCodeAnalyzer/quickFix/replacePrimitiveWithBoxed"; } + + @Override + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_5; + } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceWithListAccessTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceWithListAccessTest.java index e5777643c4a8..7e604b7b71a3 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceWithListAccessTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceWithListAccessTest.java @@ -18,7 +18,7 @@ package com.intellij.codeInsight.daemon.quickFix; /** * @author Danila Ponomarenko */ -public class ReplaceWithListAccessTest extends LightQuickFixTestCase { +public class ReplaceWithListAccessTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceWithTernaryOperatorTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceWithTernaryOperatorTest.java index 3692eecbf886..1cc9dedf80ee 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceWithTernaryOperatorTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceWithTernaryOperatorTest.java @@ -25,7 +25,7 @@ import com.intellij.codeInspection.dataFlow.DataFlowInspection; import com.intellij.codeInspection.nullable.NullableStuffInspection; import org.jetbrains.annotations.NotNull; -public class ReplaceWithTernaryOperatorTest extends LightQuickFixTestCase { +public class ReplaceWithTernaryOperatorTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected LocalInspectionTool[] configureLocalInspectionTools() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReuseVariableDeclarationTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReuseVariableDeclarationTest.java index 043e67830c72..8f79c13a07eb 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReuseVariableDeclarationTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReuseVariableDeclarationTest.java @@ -1,7 +1,7 @@ package com.intellij.codeInsight.daemon.quickFix; -public class ReuseVariableDeclarationTest extends LightQuickFixTestCase { +public class ReuseVariableDeclarationTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SafeVarargsCanBeUsedTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SafeVarargsCanBeUsedTest.java index 6b4605b2565e..4c5598e61a03 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SafeVarargsCanBeUsedTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SafeVarargsCanBeUsedTest.java @@ -20,7 +20,7 @@ import com.intellij.codeInspection.PossibleHeapPollutionVarargsInspection; import org.jetbrains.annotations.NotNull; -public class SafeVarargsCanBeUsedTest extends LightQuickFixTestCase { +public class SafeVarargsCanBeUsedTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected LocalInspectionTool[] configureLocalInspectionTools() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Simplify2DiamondInspectionsTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Simplify2DiamondInspectionsTest.java index bd3f7a0c7731..eb3b79544963 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Simplify2DiamondInspectionsTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Simplify2DiamondInspectionsTest.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; //todo test3 should be checked if it compiles - as now javac infers Object instead of String?! -public class Simplify2DiamondInspectionsTest extends LightQuickFixTestCase { +public class Simplify2DiamondInspectionsTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected LocalInspectionTool[] configureLocalInspectionTools() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/StaticImportMethodTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/StaticImportMethodTest.java index aa0f827acc10..2414ae9dc6dd 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/StaticImportMethodTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/StaticImportMethodTest.java @@ -1,6 +1,8 @@ package com.intellij.codeInsight.daemon.quickFix; -public class StaticImportMethodTest extends LightQuickFix15TestCase { +import com.intellij.pom.java.LanguageLevel; + +public class StaticImportMethodTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @@ -8,4 +10,9 @@ public class StaticImportMethodTest extends LightQuickFix15TestCase { protected String getBasePath() { return "/codeInsight/daemonCodeAnalyzer/quickFix/staticImportMethod"; } + + @Override + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_5; + } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SuperMethodReturnTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SuperMethodReturnTest.java index 83083c4320eb..243fce3e360d 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SuperMethodReturnTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SuperMethodReturnTest.java @@ -1,9 +1,8 @@ - package com.intellij.codeInsight.daemon.quickFix; -public class SuperMethodReturnTest extends LightQuickFixTestCase { +public class SuperMethodReturnTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception {doAllTests();} diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Suppress15InspectionsTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Suppress15InspectionsTest.java index 2ab3462a091e..c9baaed20115 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Suppress15InspectionsTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Suppress15InspectionsTest.java @@ -27,7 +27,7 @@ import com.intellij.codeInspection.unusedSymbol.UnusedSymbolLocalInspection; import org.jetbrains.annotations.NotNull; -public class Suppress15InspectionsTest extends LightQuickFixTestCase { +public class Suppress15InspectionsTest extends LightQuickFixParameterizedTestCase { @Override protected void setUp() throws Exception { super.setUp(); diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SuppressLocalInspectionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SuppressLocalInspectionTest.java index a69ef8cffd5d..8a992b117ff3 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SuppressLocalInspectionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SuppressLocalInspectionTest.java @@ -1,4 +1,3 @@ - package com.intellij.codeInsight.daemon.quickFix; import com.intellij.codeInspection.LocalInspectionTool; @@ -7,11 +6,10 @@ import com.intellij.openapi.roots.LanguageLevelProjectExtension; import com.intellij.pom.java.LanguageLevel; import org.jetbrains.annotations.NotNull; -public class SuppressLocalInspectionTest extends LightQuickFixTestCase { +public class SuppressLocalInspectionTest extends LightQuickFixParameterizedTestCase { @Override - protected void setUp() throws Exception { - super.setUp(); - LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.JDK_1_3); + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_3; } @NotNull diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SuppressNonInspectionsTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SuppressNonInspectionsTest.java index 78ecf4f3113b..2b69de699961 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SuppressNonInspectionsTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SuppressNonInspectionsTest.java @@ -1,4 +1,3 @@ - package com.intellij.codeInsight.daemon.quickFix; import com.intellij.codeInspection.LocalInspectionTool; @@ -14,12 +13,10 @@ import com.intellij.pom.java.LanguageLevel; import org.jetbrains.annotations.NotNull; -public class SuppressNonInspectionsTest extends LightQuickFixTestCase { - +public class SuppressNonInspectionsTest extends LightQuickFixParameterizedTestCase { @Override - protected void setUp() throws Exception { - super.setUp(); - LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.JDK_1_3); + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_3; } @NotNull diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SurroundWithArrayFixTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SurroundWithArrayFixTest.java index 287edeaa1cf8..00df904412f4 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SurroundWithArrayFixTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SurroundWithArrayFixTest.java @@ -20,7 +20,9 @@ */ package com.intellij.codeInsight.daemon.quickFix; -public class SurroundWithArrayFixTest extends LightQuickFix15TestCase { +import com.intellij.pom.java.LanguageLevel; + +public class SurroundWithArrayFixTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @@ -29,4 +31,9 @@ public class SurroundWithArrayFixTest extends LightQuickFix15TestCase { protected String getBasePath() { return "/codeInsight/daemonCodeAnalyzer/quickFix/surroundWithArray"; } + + @Override + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_5; + } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SurroundWithIfFixTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SurroundWithIfFixTest.java index 19ed7fc148c4..6283e82a45de 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SurroundWithIfFixTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SurroundWithIfFixTest.java @@ -24,7 +24,7 @@ import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.dataFlow.DataFlowInspection; import org.jetbrains.annotations.NotNull; -public class SurroundWithIfFixTest extends LightQuickFixTestCase { +public class SurroundWithIfFixTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected LocalInspectionTool[] configureLocalInspectionTools() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SurroundWithTryCatchTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SurroundWithTryCatchTest.java index 207dcf388099..c75c6dd5b1b8 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SurroundWithTryCatchTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SurroundWithTryCatchTest.java @@ -15,7 +15,7 @@ */ package com.intellij.codeInsight.daemon.quickFix; -public class SurroundWithTryCatchTest extends LightQuickFixTestCase { +public class SurroundWithTryCatchTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/UnimplementIntentionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/UnimplementIntentionTest.java index accd592c6323..5637c083773a 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/UnimplementIntentionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/UnimplementIntentionTest.java @@ -15,7 +15,7 @@ */ package com.intellij.codeInsight.daemon.quickFix; -public class UnimplementIntentionTest extends LightQuickFixTestCase { +public class UnimplementIntentionTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableAccessFromInnerClass18Test.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableAccessFromInnerClass18Test.java index 2a3b06001a51..84201d73e69b 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableAccessFromInnerClass18Test.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableAccessFromInnerClass18Test.java @@ -20,7 +20,7 @@ import com.intellij.openapi.command.WriteCommandAction; /** * User: anna */ -public class VariableAccessFromInnerClass18Test extends LightQuickFixTestCase { +public class VariableAccessFromInnerClass18Test extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableArrayTypeTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableArrayTypeTest.java index fd9765ab8426..99f318efbd8d 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableArrayTypeTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableArrayTypeTest.java @@ -1,6 +1,6 @@ package com.intellij.codeInsight.daemon.quickFix; -public class VariableArrayTypeTest extends LightQuickFixTestCase { +public class VariableArrayTypeTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableParameterizedTypeTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableParameterizedTypeTest.java index 9a7fa9b7d461..0df311de36c3 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableParameterizedTypeTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableParameterizedTypeTest.java @@ -1,6 +1,8 @@ package com.intellij.codeInsight.daemon.quickFix; -public class VariableParameterizedTypeTest extends LightQuickFix15TestCase { +import com.intellij.pom.java.LanguageLevel; + +public class VariableParameterizedTypeTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @@ -9,5 +11,9 @@ public class VariableParameterizedTypeTest extends LightQuickFix15TestCase { return "/codeInsight/daemonCodeAnalyzer/quickFix/variableParameterizedType"; } + @Override + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_5; + } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableTypeFromCallTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableTypeFromCallTest.java index 6ee5908adc68..d4f87067355a 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableTypeFromCallTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableTypeFromCallTest.java @@ -16,7 +16,7 @@ package com.intellij.codeInsight.daemon.quickFix; -public class VariableTypeFromCallTest extends LightQuickFixTestCase { +public class VariableTypeFromCallTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableTypeTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableTypeTest.java index 0a61f1cc33de..6ce721a3b131 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableTypeTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableTypeTest.java @@ -1,6 +1,6 @@ package com.intellij.codeInsight.daemon.quickFix; -public class VariableTypeTest extends LightQuickFixTestCase { +public class VariableTypeTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/WrapExpressionFixTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/WrapExpressionFixTest.java index 92b441a9fb0d..58d0ea527bb2 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/WrapExpressionFixTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/WrapExpressionFixTest.java @@ -18,11 +18,10 @@ package com.intellij.codeInsight.daemon.quickFix; import com.intellij.openapi.roots.LanguageLevelProjectExtension; import com.intellij.pom.java.LanguageLevel; -public class WrapExpressionFixTest extends LightQuickFixTestCase { +public class WrapExpressionFixTest extends LightQuickFixParameterizedTestCase { @Override - protected void setUp() throws Exception { - super.setUp(); - LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.JDK_1_6); + protected LanguageLevel getLanguageLevel() { + return LanguageLevel.JDK_1_6; } public void test() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/ConvertParameterToLocalVariableTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/ConvertParameterToLocalVariableTest.java index 8a7cf8e4a462..f008400b4307 100644 --- a/java/java-tests/testSrc/com/intellij/codeInspection/ConvertParameterToLocalVariableTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/ConvertParameterToLocalVariableTest.java @@ -21,13 +21,13 @@ package com.intellij.codeInspection; import com.intellij.JavaTestUtil; -import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase; +import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase; import com.intellij.codeInspection.varScopeCanBeNarrowed.ParameterCanBeLocalInspection; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -public class ConvertParameterToLocalVariableTest extends LightQuickFixTestCase { +public class ConvertParameterToLocalVariableTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected String getTestDataPath() { diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/InlineSameParameterValueTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/InlineSameParameterValueTest.java index 2ca4b72909ba..c1e400c371a7 100644 --- a/java/java-tests/testSrc/com/intellij/codeInspection/InlineSameParameterValueTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/InlineSameParameterValueTest.java @@ -5,13 +5,13 @@ package com.intellij.codeInspection; import com.intellij.JavaTestUtil; -import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase; +import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase; import com.intellij.codeInspection.sameParameterValue.SameParameterValueInspection; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -public class InlineSameParameterValueTest extends LightQuickFixTestCase { +public class InlineSameParameterValueTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected String getTestDataPath() { diff --git a/java/testFramework/src/com/intellij/codeInsight/daemon/LightIntentionActionTestCase.java b/java/testFramework/src/com/intellij/codeInsight/daemon/LightIntentionActionTestCase.java index 926818927fde..4a867130ba53 100644 --- a/java/testFramework/src/com/intellij/codeInsight/daemon/LightIntentionActionTestCase.java +++ b/java/testFramework/src/com/intellij/codeInsight/daemon/LightIntentionActionTestCase.java @@ -1,6 +1,6 @@ package com.intellij.codeInsight.daemon; -import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase; +import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase; -public abstract class LightIntentionActionTestCase extends LightQuickFixTestCase { +public abstract class LightIntentionActionTestCase extends LightQuickFixParameterizedTestCase { } diff --git a/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixParameterizedTestCase.java b/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixParameterizedTestCase.java new file mode 100644 index 000000000000..757a55c9736f --- /dev/null +++ b/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixParameterizedTestCase.java @@ -0,0 +1,159 @@ +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.codeInsight.daemon.quickFix; + +import com.intellij.openapi.application.ex.PathManagerEx; +import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import java.io.File; +import java.io.FilenameFilter; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +@RunWith(com.intellij.testFramework.Parameterized.class) +public abstract class LightQuickFixParameterizedTestCase extends LightQuickFixTestCase { + + @Parameterized.Parameter + public String myFileSuffix; + + @Parameterized.Parameter(1) + public String myTestDataPath; + + @com.intellij.testFramework.Parameterized.Parameters(name = "{0}") + public static List params(Class klass) throws Throwable{ + final QuickFixTestCase testCase = ((LightQuickFixTestCase)klass.newInstance()).createWrapper(); + final String path = testCase.getBasePath(); + + assertNotNull("getBasePath() should not return null!", path); + + PathManagerEx.replaceLookupStrategy(klass, LightQuickFixTestCase.class, com.intellij.testFramework.Parameterized.class); + + String testDataPath = testCase.getTestDataPath(); + final String testDirPath = testDataPath.replace(File.separatorChar, '/') + path; + File testDir = new File(testDirPath); + final File[] files = testDir.listFiles(new FilenameFilter() { + @Override + public boolean accept(File dir, @NonNls String name) { + return name.startsWith(BEFORE_PREFIX); + } + }); + + if (files == null) { + fail("Test files not found in " + testDirPath); + } + + final List result = new ArrayList(); + for (File file : files) { + final String testName = file.getName().substring(BEFORE_PREFIX.length()); + result.add(new Object[] {testName, testDataPath}); + } + return result; + } + + @Parameterized.Parameters(name = "{0}") + public static List params() throws Throwable{ + return Collections.emptyList(); + } + + @NotNull + @Override + protected String getTestDataPath() { + if (myTestDataPath != null) { + return myTestDataPath; + } + return super.getTestDataPath(); + } + + @Override + public String getName() { + if (myFileSuffix != null) { + return "test" + myFileSuffix; + } + return super.getName(); + } + + @Before + public void before() throws Throwable { + final Throwable[] throwables = new Throwable[1]; + + invokeTestRunnable(new Runnable() { + @Override + public void run() { + try { + LightQuickFixParameterizedTestCase.this.setUp(); + } + catch (Throwable e) { + throwables[0] = e; + } + } + }); + + if (throwables[0] != null) { + throw throwables[0]; + } + } + + @After + public void after() throws Throwable { + final Throwable[] throwables = new Throwable[1]; + + invokeTestRunnable(new Runnable() { + @Override + public void run() { + try { + LightQuickFixParameterizedTestCase.this.tearDown(); + } + catch (Throwable e) { + throwables[0] = e; + } + } + }); + if (throwables[0] != null) { + throw throwables[0]; + } + } + + @Test + public void runSingle() throws Throwable { + final Throwable[] throwables = new Throwable[1]; + + Runnable runnable = new Runnable() { + @Override + public void run() { + try { + doSingleTest(myFileSuffix, myTestDataPath); + } + catch (Throwable e) { + throwables[0] = e; + } + } + }; + + invokeTestRunnable(runnable); + + if (throwables[0] != null) { + throw throwables[0]; + } + + } +} diff --git a/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java b/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java index 0925baf4d5ea..7f4f8ffb1655 100644 --- a/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java +++ b/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java @@ -52,8 +52,8 @@ import java.util.regex.Pattern; import static com.intellij.util.ObjectUtils.notNull; public abstract class LightQuickFixTestCase extends LightDaemonAnalyzerTestCase { - @NonNls private static final String BEFORE_PREFIX = "before"; - @NonNls private static final String AFTER_PREFIX = "after"; + @NonNls protected static final String BEFORE_PREFIX = "before"; + @NonNls protected static final String AFTER_PREFIX = "after"; private static QuickFixTestCase myWrapper; @@ -228,9 +228,18 @@ public abstract class LightQuickFixTestCase extends LightDaemonAnalyzerTestCase protected void doAllTests() { doAllTests(createWrapper()); } + protected void doSingleTest(String fileSuffix, String testDataPath) { + doTestFor(fileSuffix, createWrapper(testDataPath)); + } - private QuickFixTestCase createWrapper() { + protected QuickFixTestCase createWrapper() { + return createWrapper(null); + } + + protected QuickFixTestCase createWrapper(final String testDataPath) { return new QuickFixTestCase() { + public String myTestDataPath = testDataPath; + @Override public String getBasePath() { return LightQuickFixTestCase.this.getBasePath(); @@ -238,7 +247,10 @@ public abstract class LightQuickFixTestCase extends LightDaemonAnalyzerTestCase @Override public String getTestDataPath() { - return LightQuickFixTestCase.this.getTestDataPath(); + if (myTestDataPath == null) { + myTestDataPath = LightQuickFixTestCase.this.getTestDataPath(); + } + return myTestDataPath; } @Override diff --git a/platform/testFramework/src/com/intellij/openapi/application/ex/PathManagerEx.java b/platform/testFramework/src/com/intellij/openapi/application/ex/PathManagerEx.java index 37803518329f..4844851b81e2 100644 --- a/platform/testFramework/src/com/intellij/openapi/application/ex/PathManagerEx.java +++ b/platform/testFramework/src/com/intellij/openapi/application/ex/PathManagerEx.java @@ -338,7 +338,7 @@ public class PathManagerEx { } private static boolean isJUnitClass(Class clazz) { - return TestCase.class.isAssignableFrom(clazz) || TestRunnerUtil.isJUnit4TestClass(clazz); + return TestCase.class.isAssignableFrom(clazz) || TestRunnerUtil.isJUnit4TestClass(clazz) || com.intellij.testFramework.Parameterized.class.isAssignableFrom(clazz); } @Nullable @@ -358,6 +358,13 @@ public class PathManagerEx { return result; } + public static void replaceLookupStrategy(Class substitutor, Class... initial) { + CLASS_STRATEGY_CACHE.clear(); + for (Class aClass : initial) { + CLASS_STRATEGY_CACHE.put(aClass, determineLookupStrategy(substitutor)); + } + } + private static FileSystemLocation computeClassLocation(Class clazz) { String classRootPath = PathManager.getJarPathForClass(clazz); if (classRootPath == null) { diff --git a/platform/testFramework/src/com/intellij/testFramework/Parameterized.java b/platform/testFramework/src/com/intellij/testFramework/Parameterized.java new file mode 100644 index 000000000000..0d08d580ec3e --- /dev/null +++ b/platform/testFramework/src/com/intellij/testFramework/Parameterized.java @@ -0,0 +1,68 @@ +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.testFramework; + +import org.junit.runners.model.FrameworkMethod; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.lang.reflect.Method; +import java.util.List; + +public class Parameterized extends org.junit.runners.Parameterized { + + @Retention(RetentionPolicy.RUNTIME) + @Target(ElementType.METHOD) + public @interface Parameters { + String name() default "{index}"; + } + + public Parameterized(Class klass) throws Throwable { + super(klass); + FrameworkMethod parametersMethod = getParametersMethod(); + if (parametersMethod != null) { + Parameters parameters = parametersMethod.getAnnotation(Parameters.class); + Method declaredMethod = + org.junit.runners.Parameterized.class.getDeclaredMethod("createRunnersForParameters", Iterable.class, String.class); + declaredMethod.setAccessible(true); + declaredMethod.invoke(this, allParameters(klass, parametersMethod), parameters.name()); + } + } + + private FrameworkMethod getParametersMethod() throws Exception { + List methods = getTestClass().getAnnotatedMethods(Parameters.class); + for (FrameworkMethod each : methods) { + if (each.isStatic() && each.isPublic()) { + return each; + } + } + + return null; + } + + private static Iterable allParameters(Class klass, FrameworkMethod parametersMethod) throws Throwable { + Object parameters = parametersMethod.invokeExplosively(null, klass); + if (parameters instanceof Iterable) { + return (Iterable) parameters; + } else { + throw new IllegalArgumentException("Wrong return type"); + } + } + + +} diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/inheritance/StaticInheritanceTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/inheritance/StaticInheritanceTest.java index 146e2c0d084b..ecdb8323961d 100644 --- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/inheritance/StaticInheritanceTest.java +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/inheritance/StaticInheritanceTest.java @@ -15,7 +15,7 @@ */ package com.siyeh.ig.inheritance; -import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase; +import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.openapi.application.PluginPathManager; import org.jetbrains.annotations.NotNull; @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; /** * User: cdr */ -public class StaticInheritanceTest extends LightQuickFixTestCase { +public class StaticInheritanceTest extends LightQuickFixParameterizedTestCase { @NotNull @Override protected LocalInspectionTool[] configureLocalInspectionTools() { diff --git a/xml/tests/src/com/intellij/codeInsight/XmlWrongClosingTagNameInspectionTest.java b/xml/tests/src/com/intellij/codeInsight/XmlWrongClosingTagNameInspectionTest.java index f36fa468d3c8..86f5936d9714 100644 --- a/xml/tests/src/com/intellij/codeInsight/XmlWrongClosingTagNameInspectionTest.java +++ b/xml/tests/src/com/intellij/codeInsight/XmlWrongClosingTagNameInspectionTest.java @@ -1,6 +1,6 @@ package com.intellij.codeInsight; -import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase; +import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase; import com.intellij.testFramework.PlatformTestUtil; import org.jetbrains.annotations.NotNull; @@ -9,7 +9,7 @@ import java.io.File; /** * @author spleaner */ -public class XmlWrongClosingTagNameInspectionTest extends LightQuickFixTestCase { +public class XmlWrongClosingTagNameInspectionTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/FetchExternalResourcesFixTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/FetchExternalResourcesFixTest.java index 63d2142c8fd3..34093be6fdf0 100644 --- a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/FetchExternalResourcesFixTest.java +++ b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/FetchExternalResourcesFixTest.java @@ -14,7 +14,7 @@ import java.io.File; * Time: 19:32:51 * To change this template use Options | File Templates. */ -public class FetchExternalResourcesFixTest extends LightQuickFixTestCase { +public class FetchExternalResourcesFixTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/IgnoreExternalResourcesFixTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/IgnoreExternalResourcesFixTest.java index 8fd027719a26..456112525aad 100644 --- a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/IgnoreExternalResourcesFixTest.java +++ b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/IgnoreExternalResourcesFixTest.java @@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull; import java.io.File; -public class IgnoreExternalResourcesFixTest extends LightQuickFixTestCase { +public class IgnoreExternalResourcesFixTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/ManuallySetupExternalResourcesFixTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/ManuallySetupExternalResourcesFixTest.java index 9a479ec096ac..283fbc63d1ae 100644 --- a/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/ManuallySetupExternalResourcesFixTest.java +++ b/xml/tests/src/com/intellij/codeInsight/daemon/quickFix/ManuallySetupExternalResourcesFixTest.java @@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull; import java.io.File; -public class ManuallySetupExternalResourcesFixTest extends LightQuickFixTestCase { +public class ManuallySetupExternalResourcesFixTest extends LightQuickFixParameterizedTestCase { public void test() throws Exception { doAllTests(); } @Override