From edcb330281a558a98fc7c076180aa456b87d9387 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Tue, 21 Jul 2015 08:50:18 +0300 Subject: [PATCH] Corrected/removed tests related to on-the-fly import optimization --- .../checkNotImportedTypesFromJava/bar/Bar.java | 5 ----- .../checkNotImportedTypesFromJava/bar/Other.java | 5 ----- .../checkNotImportedTypesFromJava/foo/Foo.java | 9 --------- .../checkNotImportedTypesFromJava/foo/Impl.kt | 7 ------- .../checkNotImportedTypesFromJava/foo/Impl.kt.after | 13 ------------- .../shortenRefs/imports/ImportsOnTheFlyBug.kt | 5 ----- .../shortenRefs/imports/ImportsOnTheFlyBug.kt.after | 5 ----- .../imports/leaveQualifiedConstructor.kt | 1 - .../imports/leaveQualifiedConstructor.kt.after | 6 +++--- .../shortenRefs/imports/leaveQualifiedType.kt | 1 - .../shortenRefs/imports/leaveQualifiedType.kt.after | 6 +++--- .../shortenRefs/imports/optimizeMultipleImports.kt | 4 ---- .../imports/optimizeMultipleImports.kt.after | 5 ----- .../org/jetbrains/kotlin/AbstractImportsTest.kt | 5 ----- .../idea/codeInsight/OverrideImplementTest.java | 12 ------------ .../shortenRefs/ShortenRefsTestGenerated.java | 12 ------------ 16 files changed, 6 insertions(+), 95 deletions(-) delete mode 100644 idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/bar/Bar.java delete mode 100644 idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/bar/Other.java delete mode 100644 idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/foo/Foo.java delete mode 100644 idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/foo/Impl.kt delete mode 100644 idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/foo/Impl.kt.after delete mode 100644 idea/testData/shortenRefs/imports/ImportsOnTheFlyBug.kt delete mode 100644 idea/testData/shortenRefs/imports/ImportsOnTheFlyBug.kt.after delete mode 100644 idea/testData/shortenRefs/imports/optimizeMultipleImports.kt delete mode 100644 idea/testData/shortenRefs/imports/optimizeMultipleImports.kt.after diff --git a/idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/bar/Bar.java b/idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/bar/Bar.java deleted file mode 100644 index 44d04659de6..00000000000 --- a/idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/bar/Bar.java +++ /dev/null @@ -1,5 +0,0 @@ -package bar; - -public interface Bar { - -} diff --git a/idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/bar/Other.java b/idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/bar/Other.java deleted file mode 100644 index 4cc642287e9..00000000000 --- a/idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/bar/Other.java +++ /dev/null @@ -1,5 +0,0 @@ -package bar; - -public interface Other { - -} diff --git a/idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/foo/Foo.java b/idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/foo/Foo.java deleted file mode 100644 index 42b96fd46d6..00000000000 --- a/idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/foo/Foo.java +++ /dev/null @@ -1,9 +0,0 @@ -package foo; - -import bar.Bar; -import bar.Other; -import java.util.ArrayList; - -public class Foo { - abstract public Bar foo(ArrayList list, Other other); -} diff --git a/idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/foo/Impl.kt b/idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/foo/Impl.kt deleted file mode 100644 index 7e84873434b..00000000000 --- a/idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/foo/Impl.kt +++ /dev/null @@ -1,7 +0,0 @@ -package foo - -class Impl: Foo() { - -} - -// KT-4732 Override/Implement action does not add all imports when "Optimize imports on the fly" is enabled diff --git a/idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/foo/Impl.kt.after deleted file mode 100644 index 7c0da59b743..00000000000 --- a/idea/testData/codeInsight/overrideImplement/checkNotImportedTypesFromJava/foo/Impl.kt.after +++ /dev/null @@ -1,13 +0,0 @@ -package foo - -import bar.Bar -import bar.Other -import java.util.ArrayList - -class Impl: Foo() { - override fun foo(list: ArrayList?, other: Other?): Bar? { - throw UnsupportedOperationException() - } -} - -// KT-4732 Override/Implement action does not add all imports when "Optimize imports on the fly" is enabled diff --git a/idea/testData/shortenRefs/imports/ImportsOnTheFlyBug.kt b/idea/testData/shortenRefs/imports/ImportsOnTheFlyBug.kt deleted file mode 100644 index 49111aeb08d..00000000000 --- a/idea/testData/shortenRefs/imports/ImportsOnTheFlyBug.kt +++ /dev/null @@ -1,5 +0,0 @@ -// OPTIMIZE_IMPORTS: true -// NAME_COUNT_TO_USE_STAR_IMPORT: 1 -import java.util.HashMap - -val v: HashMapjava.util.Date> \ No newline at end of file diff --git a/idea/testData/shortenRefs/imports/ImportsOnTheFlyBug.kt.after b/idea/testData/shortenRefs/imports/ImportsOnTheFlyBug.kt.after deleted file mode 100644 index 1c598ceb80f..00000000000 --- a/idea/testData/shortenRefs/imports/ImportsOnTheFlyBug.kt.after +++ /dev/null @@ -1,5 +0,0 @@ -// OPTIMIZE_IMPORTS: true -// NAME_COUNT_TO_USE_STAR_IMPORT: 1 -import java.util.* - -val v: HashMap \ No newline at end of file diff --git a/idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt b/idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt index a56ebd0d694..4b4c644b931 100644 --- a/idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt +++ b/idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt @@ -1,4 +1,3 @@ -// OPTIMIZE_IMPORTS: true import java.util.Date val x = java.sql.Date(1) diff --git a/idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt.after b/idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt.after index 817ce568428..598f17649c7 100644 --- a/idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt.after +++ b/idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt.after @@ -1,4 +1,4 @@ -// OPTIMIZE_IMPORTS: true -import java.sql.Date +import java.sql +import java.util.Date -val x = Date(1) +val x = sql.Date(1) diff --git a/idea/testData/shortenRefs/imports/leaveQualifiedType.kt b/idea/testData/shortenRefs/imports/leaveQualifiedType.kt index cac027f928d..84791650b1c 100644 --- a/idea/testData/shortenRefs/imports/leaveQualifiedType.kt +++ b/idea/testData/shortenRefs/imports/leaveQualifiedType.kt @@ -1,4 +1,3 @@ -// OPTIMIZE_IMPORTS: true import java.util.Date class A : java.sql.Date \ No newline at end of file diff --git a/idea/testData/shortenRefs/imports/leaveQualifiedType.kt.after b/idea/testData/shortenRefs/imports/leaveQualifiedType.kt.after index a9168645c7a..06c610ca86f 100644 --- a/idea/testData/shortenRefs/imports/leaveQualifiedType.kt.after +++ b/idea/testData/shortenRefs/imports/leaveQualifiedType.kt.after @@ -1,4 +1,4 @@ -// OPTIMIZE_IMPORTS: true -import java.sql.Date +import java.sql +import java.util.Date -class A : Date \ No newline at end of file +class A : sql.Date \ No newline at end of file diff --git a/idea/testData/shortenRefs/imports/optimizeMultipleImports.kt b/idea/testData/shortenRefs/imports/optimizeMultipleImports.kt deleted file mode 100644 index 2b30f48ff5c..00000000000 --- a/idea/testData/shortenRefs/imports/optimizeMultipleImports.kt +++ /dev/null @@ -1,4 +0,0 @@ -// OPTIMIZE_IMPORTS: true -import java.io.* - -class A(val d: java.sql.Date, val rs: java.sql.ResultSet) diff --git a/idea/testData/shortenRefs/imports/optimizeMultipleImports.kt.after b/idea/testData/shortenRefs/imports/optimizeMultipleImports.kt.after deleted file mode 100644 index d9b8ae8be24..00000000000 --- a/idea/testData/shortenRefs/imports/optimizeMultipleImports.kt.after +++ /dev/null @@ -1,5 +0,0 @@ -// OPTIMIZE_IMPORTS: true -import java.sql.Date -import java.sql.ResultSet - -class A(val d: Date, val rs: ResultSet) diff --git a/idea/tests/org/jetbrains/kotlin/AbstractImportsTest.kt b/idea/tests/org/jetbrains/kotlin/AbstractImportsTest.kt index 91da088ac6a..14528a588ca 100644 --- a/idea/tests/org/jetbrains/kotlin/AbstractImportsTest.kt +++ b/idea/tests/org/jetbrains/kotlin/AbstractImportsTest.kt @@ -34,14 +34,11 @@ public abstract class AbstractImportsTest : JetLightCodeInsightFixtureTestCase() override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE protected fun doTest(testPath: String) { - val codeInsightSettings = CodeInsightSettings.getInstance() - val settingManager = CodeStyleSettingsManager.getInstance() val tempSettings = settingManager.getCurrentSettings().clone() settingManager.setTemporarySettings(tempSettings) val codeStyleSettings = JetCodeStyleSettings.getInstance(getProject()) - val optimizeImportsSaved = codeInsightSettings.OPTIMIZE_IMPORTS_ON_THE_FLY try { val fixture = myFixture @@ -59,7 +56,6 @@ public abstract class AbstractImportsTest : JetLightCodeInsightFixtureTestCase() val file = fixture.getFile() as JetFile val fileText = file.getText() - codeInsightSettings.OPTIMIZE_IMPORTS_ON_THE_FLY = InTextDirectivesUtils.getPrefixedBoolean(fileText, "// OPTIMIZE_IMPORTS:") ?: false codeStyleSettings.NAME_COUNT_TO_USE_STAR_IMPORT = InTextDirectivesUtils.getPrefixedInt(fileText, "// NAME_COUNT_TO_USE_STAR_IMPORT:") ?: nameCountToUseStarImportDefault codeStyleSettings.IMPORT_PACKAGES = InTextDirectivesUtils.getPrefixedBoolean(fileText, "// IMPORT_PACKAGES:") ?: true @@ -79,7 +75,6 @@ public abstract class AbstractImportsTest : JetLightCodeInsightFixtureTestCase() JetTestUtils.assertEqualsToFile(File(testPath + ".after"), myFixture.getFile().getText()) } finally { - codeInsightSettings.OPTIMIZE_IMPORTS_ON_THE_FLY = optimizeImportsSaved settingManager.dropTemporarySettings() } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.java index ff0264a7781..e8159f34e69 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.java @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.idea.codeInsight; -import com.intellij.codeInsight.CodeInsightSettings; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; public final class OverrideImplementTest extends AbstractOverrideImplementTest { @@ -167,17 +166,6 @@ public final class OverrideImplementTest extends AbstractOverrideImplementTest { doMultiOverrideFileTest(); } - public void testCheckNotImportedTypesFromJava() { - boolean oldValue = CodeInsightSettings.getInstance().OPTIMIZE_IMPORTS_ON_THE_FLY; - try { - CodeInsightSettings.getInstance().OPTIMIZE_IMPORTS_ON_THE_FLY = true; - doImplementDirectoryTest(); - } - finally { - CodeInsightSettings.getInstance().OPTIMIZE_IMPORTS_ON_THE_FLY = oldValue; - } - } - public void testOverrideSamAdapters() { doOverrideDirectoryTest("foo"); } diff --git a/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java b/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java index 3cce5b7ccae..7bc766e3453 100644 --- a/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java @@ -190,12 +190,6 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest { doTest(fileName); } - @TestMetadata("ImportsOnTheFlyBug.kt") - public void testImportsOnTheFlyBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/imports/ImportsOnTheFlyBug.kt"); - doTest(fileName); - } - @TestMetadata("leaveQualifiedConstructor.kt") public void testLeaveQualifiedConstructor() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt"); @@ -207,12 +201,6 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest { String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/imports/leaveQualifiedType.kt"); doTest(fileName); } - - @TestMetadata("optimizeMultipleImports.kt") - public void testOptimizeMultipleImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/imports/optimizeMultipleImports.kt"); - doTest(fileName); - } } @TestMetadata("idea/testData/shortenRefs/java")