From d9dd5f88d098188bcc0ec6e4e42d6ab811df0675 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 19 Jul 2010 16:50:48 +0400 Subject: [PATCH] remove meaningless 'throws Exception' --- .../com/jetbrains/python/PyIntentionTest.java | 45 ++++++++--------- .../com/jetbrains/python/PyQuickFixTest.java | 50 +++++++++---------- 2 files changed, 46 insertions(+), 49 deletions(-) diff --git a/python/testSrc/com/jetbrains/python/PyIntentionTest.java b/python/testSrc/com/jetbrains/python/PyIntentionTest.java index bbd2a6ed583e..d4bac1ce6bc2 100644 --- a/python/testSrc/com/jetbrains/python/PyIntentionTest.java +++ b/python/testSrc/com/jetbrains/python/PyIntentionTest.java @@ -6,21 +6,18 @@ import com.jetbrains.python.psi.LanguageLevel; import com.jetbrains.python.psi.impl.PythonLanguageLevelPusher; /** - * Created by IntelliJ IDEA. - * User: Alexey.Ivanov - * Date: 25.02.2010 - * Time: 12:45:53 + * @author Alexey.Ivanov */ public class PyIntentionTest extends PyLightFixtureTestCase { - private void doTest(String hint) throws Exception { + private void doTest(String hint) { myFixture.configureByFile("before" + getTestName(false) + ".py"); final IntentionAction action = myFixture.findSingleIntention(hint); myFixture.launchAction(action); myFixture.checkResultByFile("after" + getTestName(false) + ".py"); } - private void doTest(String hint, LanguageLevel languageLevel) throws Exception { + private void doTest(String hint, LanguageLevel languageLevel) { PythonLanguageLevelPusher.setForcedLanguageLevel(myFixture.getProject(), languageLevel); try { doTest(hint); @@ -34,75 +31,75 @@ public class PyIntentionTest extends PyLightFixtureTestCase { return PythonTestUtil.getTestDataPath() + "/intentions/"; } - public void testConvertDictComp() throws Exception { + public void testConvertDictComp() { doTest(PyBundle.message("INTN.convert.dict.comp.to")); } - public void testConvertSetLiteral() throws Exception { + public void testConvertSetLiteral() { doTest(PyBundle.message("INTN.convert.set.literal.to")); } - public void testReplaceExceptPart() throws Exception { + public void testReplaceExceptPart() { doTest(PyBundle.message("INTN.convert.except.to"), LanguageLevel.PYTHON30); } - public void testConvertBuiltins() throws Exception { + public void testConvertBuiltins() { doTest(PyBundle.message("INTN.convert.builtin.import"), LanguageLevel.PYTHON30); } - public void testReplaceNotEqOperator() throws Exception { + public void testReplaceNotEqOperator() { doTest(PyBundle.message("INTN.replace.noteq.operator")); } - public void testRemoveLeadingU() throws Exception { + public void testRemoveLeadingU() { doTest(PyBundle.message("INTN.remove.leading.u"), LanguageLevel.PYTHON30); } - public void testRemoveTrailingL() throws Exception { + public void testRemoveTrailingL() { doTest(PyBundle.message("INTN.remove.trailing.l"), LanguageLevel.PYTHON30); } - public void testReplaceOctalNumericLiteral() throws Exception { + public void testReplaceOctalNumericLiteral() { doTest(PyBundle.message("INTN.replace.octal.numeric.literal"), LanguageLevel.PYTHON30); } - public void testReplaceListComprehensions() throws Exception { + public void testReplaceListComprehensions() { doTest(PyBundle.message("INTN.replace.list.comprehensions"), LanguageLevel.PYTHON30); } - public void testReplaceRaiseStatement() throws Exception { + public void testReplaceRaiseStatement() { doTest(PyBundle.message("INTN.replace.raise.statement"), LanguageLevel.PYTHON30); } - public void testReplaceBackQuoteExpression() throws Exception { + public void testReplaceBackQuoteExpression() { doTest(PyBundle.message("INTN.replace.backquote.expression"), LanguageLevel.PYTHON30); } - public void testReplaceMethod() throws Exception { + public void testReplaceMethod() { doTest(PyBundle.message("INTN.replace.method"), LanguageLevel.PYTHON30); } - public void testSplitIf() throws Exception { + public void testSplitIf() { doTest(PyBundle.message("INTN.split.if.text")); } - public void testNegateComparison() throws Exception { + public void testNegateComparison() { doTest(PyBundle.message("INTN.negate.$0.to.$1", "<=", ">")); } - public void testNegateComparison2() throws Exception { + public void testNegateComparison2() { doTest(PyBundle.message("INTN.negate.$0.to.$1", ">", "<=")); } - public void testStringConcatToFormat() throws Exception { + public void testStringConcatToFormat() { doTest(PyBundle.message("INTN.replace.plus.with.format.operator")); } - public void testConvertFormatOperatorToMethod() throws Exception { + public void testConvertFormatOperatorToMethod() { doTest(PyBundle.message("INTN.replace.with.method"), LanguageLevel.PYTHON30); } - public void testFlipComparison() throws Exception { + public void testFlipComparison() { doTest(PyBundle.message("INTN.flip.$0.to.$1", ">", "<")); } diff --git a/python/testSrc/com/jetbrains/python/PyQuickFixTest.java b/python/testSrc/com/jetbrains/python/PyQuickFixTest.java index ca540b8b9790..ecdda72eed1b 100644 --- a/python/testSrc/com/jetbrains/python/PyQuickFixTest.java +++ b/python/testSrc/com/jetbrains/python/PyQuickFixTest.java @@ -16,19 +16,19 @@ import org.jetbrains.annotations.NonNls; @TestDataPath("$CONTENT_ROOT/../testData/inspections/") public class PyQuickFixTest extends PyLightFixtureTestCase { - public void testAddImport() throws Exception { + public void testAddImport() { doInspectionTest(new String[] { "AddImport.py", "ImportTarget.py" }, PyUnresolvedReferencesInspection.class, PyBundle.message("ACT.NAME.add.import"), true, true); } - public void testAddImportDoc() throws Exception { + public void testAddImportDoc() { doInspectionTest(new String[] { "AddImportDoc.py", "ImportTarget.py" }, PyUnresolvedReferencesInspection.class, PyBundle.message("ACT.NAME.add.import"), true, true); } - public void testAddImportDocComment() throws Exception { // PY-728 + public void testAddImportDocComment() { // PY-728 doInspectionTest(new String[] { "AddImportDocComment.py", "ImportTarget.py" }, PyUnresolvedReferencesInspection.class, PyBundle.message("ACT.NAME.add.import"), true, true); } - public void testQualifyByImport() throws Exception { + public void testQualifyByImport() { final PyCodeInsightSettings settings = PyCodeInsightSettings.getInstance(); boolean oldPreferFrom = settings.PREFER_FROM_IMPORT; boolean oldHighlightUnused = settings.HIGHLIGHT_UNUSED_IMPORTS; @@ -43,7 +43,7 @@ public class PyQuickFixTest extends PyLightFixtureTestCase { } } - public void testAddToImportFromList() throws Exception { + public void testAddToImportFromList() { final PyCodeInsightSettings settings = PyCodeInsightSettings.getInstance(); boolean oldHighlightUnused = settings.HIGHLIGHT_UNUSED_IMPORTS; settings.HIGHLIGHT_UNUSED_IMPORTS = false; @@ -58,89 +58,89 @@ public class PyQuickFixTest extends PyLightFixtureTestCase { // TODO: add tests for stub indexes-based autoimport of unimported somehow. - public void testAddSelf() throws Exception { + public void testAddSelf() { doInspectionTest("AddSelf.py", PyMethodParametersInspection.class, PyBundle.message("QFIX.add.parameter.self", "self"), true, true); } - public void testAddCls() throws Exception { + public void testAddCls() { doInspectionTest("AddCls.py", PyMethodParametersInspection.class, PyBundle.message("QFIX.add.parameter.self", "cls"), true, true); } - public void testRenameToSelf() throws Exception { + public void testRenameToSelf() { doInspectionTest("RenameToSelf.py", PyMethodParametersInspection.class, PyBundle.message("QFIX.rename.parameter.to.$0", "self"), true, true); } - public void testAddFieldFromMethod() throws Exception { + public void testAddFieldFromMethod() { doInspectionTest("AddFieldFromMethod.py", PyUnresolvedReferencesInspection.class, PyBundle.message("QFIX.NAME.add.field.$0.to.class.$1", "y", "A"), true, true); } - public void testAddFieldFromInstance() throws Exception { + public void testAddFieldFromInstance() { doInspectionTest("AddFieldFromInstance.py", PyUnresolvedReferencesInspection.class, PyBundle.message("QFIX.NAME.add.field.$0.to.class.$1", "y", "A"), true, true); } - public void testAddFieldAddConstructor() throws Exception { + public void testAddFieldAddConstructor() { doInspectionTest("AddFieldAddConstructor.py", PyUnresolvedReferencesInspection.class, PyBundle.message("QFIX.NAME.add.field.$0.to.class.$1", "x", "B"), true, true); } - public void testAddFieldNewConstructor() throws Exception { + public void testAddFieldNewConstructor() { doInspectionTest("AddFieldNewConstructor.py", PyUnresolvedReferencesInspection.class, PyBundle.message("QFIX.NAME.add.field.$0.to.class.$1", "x", "B"), true, true); } - public void testAddMethodFromInstance() throws Exception { + public void testAddMethodFromInstance() { doInspectionTest("AddMethodFromInstance.py", PyUnresolvedReferencesInspection.class, PyBundle.message("QFIX.NAME.add.method.$0.to.class.$1", "y", "A"), true, true); } - public void testAddMethodFromMethod() throws Exception { + public void testAddMethodFromMethod() { doInspectionTest("AddMethodFromMethod.py", PyUnresolvedReferencesInspection.class, PyBundle.message("QFIX.NAME.add.method.$0.to.class.$1", "y", "A"), true, true); } - public void testRemoveTrailingSemicolon() throws Exception { + public void testRemoveTrailingSemicolon() { doInspectionTest("RemoveTrailingSemicolon.py", PyTrailingSemicolonInspection.class, PyBundle.message("QFIX.remove.trailing.semicolon"), true, true); } - public void testDictCreation() throws Exception { + public void testDictCreation() { doInspectionTest("DictCreation.py", PyDictCreationInspection.class, PyBundle.message("QFIX.dict.creation"), true, true); } - public void testTransformClassicClass() throws Exception { + public void testTransformClassicClass() { doInspectionTest("TransformClassicClass.py", PyClassicStyleClassInspection.class, PyBundle.message("QFIX.classic.class.transform"), true, true); } - public void testAddGlobalQuickFix() throws Exception { + public void testAddGlobalQuickFix() { doInspectionTest("AddGlobalStatement.py", PyUnboundLocalVariableInspection.class, PyBundle.message("QFIX.add.global"), true, true); } - public void testAddGlobalExistingQuickFix() throws Exception { + public void testAddGlobalExistingQuickFix() { doInspectionTest("AddGlobalExistingStatement.py", PyUnboundLocalVariableInspection.class, PyBundle.message("QFIX.add.global"), true, true); } - public void testSimplifyBooleanCheckQuickFix() throws Exception { + public void testSimplifyBooleanCheckQuickFix() { doInspectionTest("SimplifyBooleanCheck.py", PySimplifyBooleanCheckInspection.class, PyBundle.message("QFIX.simplify"), true, true); } - public void testFromFutureImportQuickFix() throws Exception { + public void testFromFutureImportQuickFix() { doInspectionTest("MoveFromFutureImport.py", PyFromFutureImportInspection.class, PyBundle.message("QFIX.move.from.future.import"), true, true); } - public void testComparisonWithNoneQuickFix() throws Exception { + public void testComparisonWithNoneQuickFix() { doInspectionTest("ComparisonWithNone.py", PyComparisonWithNoneInspection.class, PyBundle.message("QFIX.replace.equality"), true, true); } - public void testAddClassFix() throws Exception { + public void testAddClassFix() { doInspectionTest("AddClass.py", PyUnresolvedReferencesInspection.class, "Create class 'Xyzzy'", true, true); } @@ -153,7 +153,7 @@ public class PyQuickFixTest extends PyLightFixtureTestCase { final Class inspectionClass, @NonNls String quickFixName, boolean applyFix, - boolean available) throws Exception { + boolean available) { doInspectionTest(new String[]{testFileName}, inspectionClass, quickFixName, applyFix, available); } @@ -171,7 +171,7 @@ public class PyQuickFixTest extends PyLightFixtureTestCase { final Class inspectionClass, @NonNls String quickFixName, boolean applyFix, - boolean available) throws Exception { + boolean available) { myFixture.enableInspections(inspectionClass); myFixture.configureByFiles(testFiles); myFixture.checkHighlighting(true, false, false);