From 7ad193369515006d783430152b670a10dc51dbd5 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Fri, 13 Feb 2015 00:16:10 +0300 Subject: [PATCH] Dropped obsolete tests --- .../importHelper/DoNotImportIfGeneralExist.kt | 6 -- .../DoNotImportIfGeneralExist.kt.after | 6 -- .../DoNotImportIfGeneralSpaceExist.kt | 6 -- .../DoNotImportIfGeneralSpaceExist.kt.after | 6 -- .../importHelper/ImportBeforeObject.kt | 2 - .../importHelper/ImportBeforeObject.kt.after | 4 - .../quickfix/importHelper/NoDefaultImport.kt | 1 - .../importHelper/NoDefaultImport.kt.after | 1 - .../imports/OptimizeImportsOnFlyTest.java | 45 ---------- .../idea/quickfix/ImportClassHelperTest.java | 84 ------------------- 10 files changed, 161 deletions(-) delete mode 100644 idea/testData/quickfix/importHelper/DoNotImportIfGeneralExist.kt delete mode 100644 idea/testData/quickfix/importHelper/DoNotImportIfGeneralExist.kt.after delete mode 100644 idea/testData/quickfix/importHelper/DoNotImportIfGeneralSpaceExist.kt delete mode 100644 idea/testData/quickfix/importHelper/DoNotImportIfGeneralSpaceExist.kt.after delete mode 100644 idea/testData/quickfix/importHelper/ImportBeforeObject.kt delete mode 100644 idea/testData/quickfix/importHelper/ImportBeforeObject.kt.after delete mode 100644 idea/testData/quickfix/importHelper/NoDefaultImport.kt delete mode 100644 idea/testData/quickfix/importHelper/NoDefaultImport.kt.after delete mode 100644 idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsOnFlyTest.java delete mode 100644 idea/tests/org/jetbrains/kotlin/idea/quickfix/ImportClassHelperTest.java diff --git a/idea/testData/quickfix/importHelper/DoNotImportIfGeneralExist.kt b/idea/testData/quickfix/importHelper/DoNotImportIfGeneralExist.kt deleted file mode 100644 index f7e6dce4946..00000000000 --- a/idea/testData/quickfix/importHelper/DoNotImportIfGeneralExist.kt +++ /dev/null @@ -1,6 +0,0 @@ -package some - -import jettesting.data.*; - -fun otherfun() { -} diff --git a/idea/testData/quickfix/importHelper/DoNotImportIfGeneralExist.kt.after b/idea/testData/quickfix/importHelper/DoNotImportIfGeneralExist.kt.after deleted file mode 100644 index f7e6dce4946..00000000000 --- a/idea/testData/quickfix/importHelper/DoNotImportIfGeneralExist.kt.after +++ /dev/null @@ -1,6 +0,0 @@ -package some - -import jettesting.data.*; - -fun otherfun() { -} diff --git a/idea/testData/quickfix/importHelper/DoNotImportIfGeneralSpaceExist.kt b/idea/testData/quickfix/importHelper/DoNotImportIfGeneralSpaceExist.kt deleted file mode 100644 index 963032725e6..00000000000 --- a/idea/testData/quickfix/importHelper/DoNotImportIfGeneralSpaceExist.kt +++ /dev/null @@ -1,6 +0,0 @@ -package some - -import jettesting . data .*; - -fun otherfun() { -} diff --git a/idea/testData/quickfix/importHelper/DoNotImportIfGeneralSpaceExist.kt.after b/idea/testData/quickfix/importHelper/DoNotImportIfGeneralSpaceExist.kt.after deleted file mode 100644 index 963032725e6..00000000000 --- a/idea/testData/quickfix/importHelper/DoNotImportIfGeneralSpaceExist.kt.after +++ /dev/null @@ -1,6 +0,0 @@ -package some - -import jettesting . data .*; - -fun otherfun() { -} diff --git a/idea/testData/quickfix/importHelper/ImportBeforeObject.kt b/idea/testData/quickfix/importHelper/ImportBeforeObject.kt deleted file mode 100644 index 9b9b1ae471c..00000000000 --- a/idea/testData/quickfix/importHelper/ImportBeforeObject.kt +++ /dev/null @@ -1,2 +0,0 @@ -object some { -} \ No newline at end of file diff --git a/idea/testData/quickfix/importHelper/ImportBeforeObject.kt.after b/idea/testData/quickfix/importHelper/ImportBeforeObject.kt.after deleted file mode 100644 index 01206050f05..00000000000 --- a/idea/testData/quickfix/importHelper/ImportBeforeObject.kt.after +++ /dev/null @@ -1,4 +0,0 @@ -import java.util.HashSet - -object some { -} \ No newline at end of file diff --git a/idea/testData/quickfix/importHelper/NoDefaultImport.kt b/idea/testData/quickfix/importHelper/NoDefaultImport.kt deleted file mode 100644 index 37bdd2221a7..00000000000 --- a/idea/testData/quickfix/importHelper/NoDefaultImport.kt +++ /dev/null @@ -1 +0,0 @@ -class A {} \ No newline at end of file diff --git a/idea/testData/quickfix/importHelper/NoDefaultImport.kt.after b/idea/testData/quickfix/importHelper/NoDefaultImport.kt.after deleted file mode 100644 index 37bdd2221a7..00000000000 --- a/idea/testData/quickfix/importHelper/NoDefaultImport.kt.after +++ /dev/null @@ -1 +0,0 @@ -class A {} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsOnFlyTest.java b/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsOnFlyTest.java deleted file mode 100644 index 8edff0a48d6..00000000000 --- a/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsOnFlyTest.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2010-2015 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 org.jetbrains.kotlin.idea.imports; - -import com.intellij.codeInsight.CodeInsightSettings; -import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase; -import com.intellij.openapi.application.ApplicationManager; -import org.jetbrains.kotlin.idea.util.ImportInsertHelper; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.psi.JetFile; - -public class OptimizeImportsOnFlyTest extends LightDaemonAnalyzerTestCase { - - public void testOptimizeImportsOnFly() throws Exception { - configureFromFileText("test.kt", "import java.util.ArrayList"); - boolean oldValue = CodeInsightSettings.getInstance().OPTIMIZE_IMPORTS_ON_THE_FLY; - try { - CodeInsightSettings.getInstance().OPTIMIZE_IMPORTS_ON_THE_FLY = true; - ApplicationManager.getApplication().runWriteAction(new Runnable() { - @Override - public void run() { - ImportInsertHelper.getInstance(getProject()).addImportDirectiveIfNeeded(new FqName("java.util.HashSet"), (JetFile) getFile()); - } - }); - } - finally { - CodeInsightSettings.getInstance().OPTIMIZE_IMPORTS_ON_THE_FLY = oldValue; - } - checkResultByText("import java.util.HashSet"); - } -} diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/ImportClassHelperTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/ImportClassHelperTest.java deleted file mode 100644 index 60b31cb551c..00000000000 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/ImportClassHelperTest.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2010-2015 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 org.jetbrains.kotlin.idea.quickfix; - -import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase; -import com.intellij.openapi.application.ApplicationManager; -import org.jetbrains.kotlin.idea.PluginTestCaseBase; -import org.jetbrains.kotlin.idea.util.ImportInsertHelper; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.psi.JetFile; - -import java.io.IOException; - -public class ImportClassHelperTest extends LightDaemonAnalyzerTestCase { - public void testDoNotImportIfGeneralExist() { - doFileTest("jettesting.data.testFunction"); - } - - public void testDoNotImportIfGeneralSpaceExist() { - doFileTest("jettesting.data.testFunction"); - } - - public void testNoDefaultImport() { - doFileTest("kotlin.io.println"); - } - - public void testImportBeforeObject() { - doFileTest("java.util.HashSet"); - } - - public void testInsertInEmptyFile() throws IOException { - configureFromFileText("testInsertInEmptyFile.kt", ""); - ApplicationManager.getApplication().runWriteAction(new Runnable() { - @Override - public void run() { - ImportInsertHelper.getInstance(getProject()).addImportDirectiveIfNeeded(new FqName("java.util.ArrayList"), (JetFile) getFile()); - } - }); - - checkResultByText("import java.util.ArrayList"); - } - - public void testInsertInPackageOnlyFile() throws IOException { - configureFromFileText("testInsertInPackageOnlyFile.kt", "package some"); - ApplicationManager.getApplication().runWriteAction(new Runnable() { - @Override - public void run() { - ImportInsertHelper.getInstance(getProject()).addImportDirectiveIfNeeded(new FqName("java.util.ArrayList"), (JetFile) getFile()); - } - }); - - checkResultByText("package some\n\nimport java.util.ArrayList"); - } - - public void doFileTest(final String importString) { - configureByFile(getTestName(false) + ".kt"); - ApplicationManager.getApplication().runWriteAction(new Runnable() { - @Override - public void run() { - ImportInsertHelper.getInstance(getProject()).addImportDirectiveIfNeeded(new FqName(importString), (JetFile) getFile()); - } - }); - checkResultByFile(getTestName(false) + ".kt.after"); - } - - @Override - protected String getTestDataPath() { - return PluginTestCaseBase.getTestDataPathBase() + "/quickfix/importHelper/"; - } -}