From f44455c237d5828d5dbad9b92fc966d2d3a92eb9 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 4 Feb 2011 17:49:30 +0100 Subject: [PATCH] IGQuickFixesTestCase generalized; cleanup --- .../replaceCastInDeclaration.after.java | 0 .../replaceCastInDeclaration.java | 0 .../replaceInstanceOf.after.java | 0 .../replaceInstanceOf.java | 0 .../CastConflictsWithInstanceofFixesTest.java | 17 +++++++++++------ .../ig/fixes/bugs/IGQuickFixesTestCase.java | 3 +-- 6 files changed, 12 insertions(+), 8 deletions(-) rename plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/{castconflicts => castConflicts}/replaceCastInDeclaration.after.java (100%) rename plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/{castconflicts => castConflicts}/replaceCastInDeclaration.java (100%) rename plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/{castconflicts => castConflicts}/replaceInstanceOf.after.java (100%) rename plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/{castconflicts => castConflicts}/replaceInstanceOf.java (100%) diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/castconflicts/replaceCastInDeclaration.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/castConflicts/replaceCastInDeclaration.after.java similarity index 100% rename from plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/castconflicts/replaceCastInDeclaration.after.java rename to plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/castConflicts/replaceCastInDeclaration.after.java diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/castconflicts/replaceCastInDeclaration.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/castConflicts/replaceCastInDeclaration.java similarity index 100% rename from plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/castconflicts/replaceCastInDeclaration.java rename to plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/castConflicts/replaceCastInDeclaration.java diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/castconflicts/replaceInstanceOf.after.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/castConflicts/replaceInstanceOf.after.java similarity index 100% rename from plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/castconflicts/replaceInstanceOf.after.java rename to plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/castConflicts/replaceInstanceOf.after.java diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/castconflicts/replaceInstanceOf.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/castConflicts/replaceInstanceOf.java similarity index 100% rename from plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/castconflicts/replaceInstanceOf.java rename to plugins/InspectionGadgets/test/com/siyeh/igfixes/bugs/castConflicts/replaceInstanceOf.java diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/bugs/CastConflictsWithInstanceofFixesTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/bugs/CastConflictsWithInstanceofFixesTest.java index 6dd7f7464eb1..3c0981cc3d5b 100644 --- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/bugs/CastConflictsWithInstanceofFixesTest.java +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/bugs/CastConflictsWithInstanceofFixesTest.java @@ -13,26 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.siyeh.ig.fixes.bugs; + +import com.siyeh.ig.bugs.CastConflictsWithInstanceofInspection; /* * User: anna * Date: 16-Jun-2009 */ -package com.siyeh.ig.fixes.bugs; - public class CastConflictsWithInstanceofFixesTest extends IGQuickFixesTestCase { + @Override + public void setUp() throws Exception { + super.setUp(); + myFixture.enableInspections(new CastConflictsWithInstanceofInspection()); + } - - public void testReplaceCastInDeclaration() throws Throwable { + public void testReplaceCastInDeclaration() { doTest("replaceCastInDeclaration", "Replace cast"); } - public void testReplaceInstaneOf() throws Throwable { + public void testReplaceInstanceOf() { doTest("replaceInstanceOf", "Replace instanceof"); } @Override protected String getRelativePath() { - return "bugs/castconflicts"; + return "bugs/castConflicts"; } } diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/bugs/IGQuickFixesTestCase.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/bugs/IGQuickFixesTestCase.java index 9fcb22b04a73..2c89ca9f52cb 100644 --- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/bugs/IGQuickFixesTestCase.java +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/bugs/IGQuickFixesTestCase.java @@ -36,7 +36,6 @@ public abstract class IGQuickFixesTestCase extends UsefulTestCase { final IdeaTestFixtureFactory fixtureFactory = IdeaTestFixtureFactory.getFixtureFactory(); final TestFixtureBuilder testFixtureBuilder = fixtureFactory.createFixtureBuilder(); myFixture = JavaTestFixtureFactory.getFixtureFactory().createCodeInsightFixture(testFixtureBuilder.getFixture()); - myFixture.enableInspections(new CastConflictsWithInstanceofInspection()); final String dataPath = PluginPathManager.getPluginHomePath("InspectionGadgets") + "/test/com/siyeh/igfixes/"; myFixture.setTestDataPath(dataPath); final JavaModuleFixtureBuilder builder = testFixtureBuilder.addModule(JavaModuleFixtureBuilder.class); @@ -52,7 +51,7 @@ public abstract class IGQuickFixesTestCase extends UsefulTestCase { super.tearDown(); } - protected void doTest(String testName, String hint) throws Throwable { + protected void doTest(String testName, String hint) { myFixture.configureByFile(getRelativePath() + "/" + testName + ".java"); final IntentionAction action = myFixture.findSingleIntention(hint); Assert.assertNotNull(action);