From 8d7aa3fdcd96dd3519edf7682cdd1cf21edec9cc Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Mon, 20 Apr 2015 16:41:02 +0300 Subject: [PATCH] Drop `throws` usages with changes in Java code --- .../kotlin/idea/test/JetLightCodeInsightFixtureTestCase.kt | 2 -- .../kotlin/findUsages/AbstractJetFindUsagesTest.java | 2 +- idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java | 2 +- .../idea/codeInsight/AbstractOutOfBlockModificationTest.java | 2 +- .../jetbrains/kotlin/idea/codeInsight/LiveTemplatesTest.java | 4 ++-- .../kotlin/idea/codeInsight/OverrideImplementTest.java | 2 +- .../kotlin/idea/codeInsight/OverrideImplementWithLibTest.java | 2 +- .../kotlin/idea/kdoc/AbstractKDocHighlightingTest.java | 2 +- .../kotlin/idea/navigation/AbstractKotlinGotoTest.java | 4 ++-- .../kotlin/safeDelete/AbstractJetSafeDeleteTest.java | 2 +- 10 files changed, 11 insertions(+), 13 deletions(-) diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JetLightCodeInsightFixtureTestCase.kt b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JetLightCodeInsightFixtureTestCase.kt index 0dad56b7a4c..74e68f78e8f 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JetLightCodeInsightFixtureTestCase.kt +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JetLightCodeInsightFixtureTestCase.kt @@ -44,7 +44,6 @@ import java.io.IOException public abstract class JetLightCodeInsightFixtureTestCase : LightCodeInsightFixtureTestCase() { private var kotlinInternalModeOriginalValue = false - throws(javaClass()) override fun setUp() { super.setUp() (StartupManager.getInstance(getProject()) as StartupManagerImpl).runPostStartupActivities() @@ -54,7 +53,6 @@ public abstract class JetLightCodeInsightFixtureTestCase : LightCodeInsightFixtu KotlinInternalMode.enabled = true } - throws(javaClass()) override fun tearDown() { KotlinInternalMode.enabled = kotlinInternalModeOriginalValue VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory()) diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java index fd21135d524..58c8b4eaf57 100644 --- a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java +++ b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java @@ -282,7 +282,7 @@ public abstract class AbstractJetFindUsagesTest extends JetLightCodeInsightFixtu } @Override - public void setUp() throws Exception { + public void setUp() { super.setUp(); myFixture.setTestDataPath(PluginTestCaseBase.getTestDataPathBase() + "/findUsages"); } diff --git a/idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java b/idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java index 105c827d9d5..dda6476f12e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java @@ -82,7 +82,7 @@ public class WordSelectionTest extends JetLightCodeInsightFixtureTestCase { } @Override - public void setUp() throws Exception { + public void setUp() { super.setUp(); String testRelativeDir = "wordSelection"; myFixture.setTestDataPath(new File(PluginTestCaseBase.getTestDataPathBase(), testRelativeDir).getPath() + diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOutOfBlockModificationTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOutOfBlockModificationTest.java index 722a4c2596f..2a008a679c2 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOutOfBlockModificationTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOutOfBlockModificationTest.java @@ -31,7 +31,7 @@ import java.io.IOException; public abstract class AbstractOutOfBlockModificationTest extends JetLightCodeInsightFixtureTestCase { @Override - public void setUp() throws Exception { + public void setUp() { super.setUp(); myFixture.setTestDataPath(PluginTestCaseBase.getTestDataPathBase() + "/codeInsight/outOfBlock"); } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesTest.java index 268b48ba042..f24b392cce3 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesTest.java @@ -42,14 +42,14 @@ import java.util.Arrays; public class LiveTemplatesTest extends JetLightCodeInsightFixtureTestCase { @Override - protected void setUp() throws Exception { + protected void setUp() { super.setUp(); myFixture.setTestDataPath(new File(PluginTestCaseBase.getTestDataPathBase(), "/templates").getPath() + File.separator); ((TemplateManagerImpl) TemplateManager.getInstance(getProject())).setTemplateTesting(true); } @Override - protected void tearDown() throws Exception { + protected void tearDown() { ((TemplateManagerImpl) TemplateManager.getInstance(getProject())).setTemplateTesting(false); super.tearDown(); } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.java index d74c4068eb0..190d5f2547d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.java @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; public final class OverrideImplementTest extends AbstractOverrideImplementTest { @Override - public void setUp() throws Exception { + public void setUp() { super.setUp(); myFixture.setTestDataPath(PluginTestCaseBase.getTestDataPathBase() + "/codeInsight/overrideImplement"); } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementWithLibTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementWithLibTest.java index d81a812149a..bd1b394cb25 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementWithLibTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementWithLibTest.java @@ -25,7 +25,7 @@ public final class OverrideImplementWithLibTest extends AbstractOverrideImplemen private static final String TEST_PATH = PluginTestCaseBase.getTestDataPathBase() + "/codeInsight/overrideImplement/withLib"; @Override - public void setUp() throws Exception { + public void setUp() { super.setUp(); myFixture.setTestDataPath(TEST_PATH); } diff --git a/idea/tests/org/jetbrains/kotlin/idea/kdoc/AbstractKDocHighlightingTest.java b/idea/tests/org/jetbrains/kotlin/idea/kdoc/AbstractKDocHighlightingTest.java index 4bcd4882dad..cf8a75360db 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/kdoc/AbstractKDocHighlightingTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/kdoc/AbstractKDocHighlightingTest.java @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.idea.highlighter.AbstractHighlightingTest; public abstract class AbstractKDocHighlightingTest extends AbstractHighlightingTest { @Override - protected void setUp() throws Exception { + protected void setUp() { super.setUp(); myFixture.enableInspections(KDocUnresolvedReferenceInspection.class); } diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java index fd119d640ad..b7e0e4a699a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java @@ -54,7 +54,7 @@ public abstract class AbstractKotlinGotoTest extends JetLightCodeInsightFixtureT private String dirPath = null; @Override - protected void setUp() throws Exception { + protected void setUp() { TestMetadata annotation = getClass().getAnnotation(TestMetadata.class); dirPath = annotation.value(); @@ -62,7 +62,7 @@ public abstract class AbstractKotlinGotoTest extends JetLightCodeInsightFixtureT } @Override - protected void tearDown() throws Exception { + protected void tearDown() { super.tearDown(); dirPath = null; } diff --git a/idea/tests/org/jetbrains/kotlin/safeDelete/AbstractJetSafeDeleteTest.java b/idea/tests/org/jetbrains/kotlin/safeDelete/AbstractJetSafeDeleteTest.java index 14c04fa5a54..4a68ed9db52 100644 --- a/idea/tests/org/jetbrains/kotlin/safeDelete/AbstractJetSafeDeleteTest.java +++ b/idea/tests/org/jetbrains/kotlin/safeDelete/AbstractJetSafeDeleteTest.java @@ -44,7 +44,7 @@ public abstract class AbstractJetSafeDeleteTest extends JetLightCodeInsightFixtu } @Override - public void setUp() throws Exception { + public void setUp() { super.setUp(); String pathBase = PluginTestCaseBase.getTestDataPathBase(); myFixture.setTestDataPath(pathBase.substring(0, pathBase.lastIndexOf("/idea/testData")));