diff --git a/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective.kt b/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective.kt deleted file mode 100644 index 83353da6e2a..00000000000 --- a/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective.kt +++ /dev/null @@ -1,5 +0,0 @@ -package foo - -fun main(args: Array) { - println() -} diff --git a/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective.kt.after b/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective.kt.after deleted file mode 100644 index 6d1ac6e56da..00000000000 --- a/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective.kt.after +++ /dev/null @@ -1,6 +0,0 @@ -package foo - -fun main(args: Array) { - 1 + 1 - println() -} diff --git a/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective.kt.fragment b/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective.kt.fragment deleted file mode 100644 index 1a5a117eb38..00000000000 --- a/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective.kt.fragment +++ /dev/null @@ -1 +0,0 @@ -1 + 1 \ No newline at end of file diff --git a/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective2.kt b/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective2.kt deleted file mode 100644 index 83353da6e2a..00000000000 --- a/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective2.kt +++ /dev/null @@ -1,5 +0,0 @@ -package foo - -fun main(args: Array) { - println() -} diff --git a/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective2.kt.after b/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective2.kt.after deleted file mode 100644 index 0b48026f3f8..00000000000 --- a/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective2.kt.after +++ /dev/null @@ -1,8 +0,0 @@ -package foo - import foo - - -fun main(args: Array) { - 1 + 1 - println() -} diff --git a/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective2.kt.fragment b/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective2.kt.fragment deleted file mode 100644 index 42eb1636025..00000000000 --- a/idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective2.kt.fragment +++ /dev/null @@ -1,3 +0,0 @@ -import foo - -1 + 1 \ No newline at end of file diff --git a/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective.kt b/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective.kt deleted file mode 100644 index b9270fff1a2..00000000000 --- a/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun main(args: Array) { - println() -} \ No newline at end of file diff --git a/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective.kt.after b/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective.kt.after deleted file mode 100644 index d79b6967d13..00000000000 --- a/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective.kt.after +++ /dev/null @@ -1,4 +0,0 @@ -fun main(args: Array) { - 1 + 1 - println() -} diff --git a/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective.kt.fragment b/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective.kt.fragment deleted file mode 100644 index 1a5a117eb38..00000000000 --- a/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective.kt.fragment +++ /dev/null @@ -1 +0,0 @@ -1 + 1 \ No newline at end of file diff --git a/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective2.kt b/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective2.kt deleted file mode 100644 index b9270fff1a2..00000000000 --- a/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective2.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun main(args: Array) { - println() -} \ No newline at end of file diff --git a/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective2.kt.after b/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective2.kt.after deleted file mode 100644 index 38241a2c540..00000000000 --- a/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective2.kt.after +++ /dev/null @@ -1,6 +0,0 @@ - - import foo.* - fun main(args: Array) { - 1 + 1 - println() -} \ No newline at end of file diff --git a/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective2.kt.fragment b/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective2.kt.fragment deleted file mode 100644 index 6e1fb966b1a..00000000000 --- a/idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective2.kt.fragment +++ /dev/null @@ -1,3 +0,0 @@ -import foo.* - -1 + 1 \ No newline at end of file diff --git a/idea/testData/debugger/insertBeforeExtractFunction/manyImports.kt b/idea/testData/debugger/insertBeforeExtractFunction/manyImports.kt deleted file mode 100644 index 29f56a31c73..00000000000 --- a/idea/testData/debugger/insertBeforeExtractFunction/manyImports.kt +++ /dev/null @@ -1,8 +0,0 @@ -package foo - -import a -import b - -fun main(args: Array) { - println() -} diff --git a/idea/testData/debugger/insertBeforeExtractFunction/manyImports.kt.after b/idea/testData/debugger/insertBeforeExtractFunction/manyImports.kt.after deleted file mode 100644 index d1dabe6f092..00000000000 --- a/idea/testData/debugger/insertBeforeExtractFunction/manyImports.kt.after +++ /dev/null @@ -1,12 +0,0 @@ -package foo - -import a -import b - import a - import b - - -fun main(args: Array) { - 1 + 1 - println() -} diff --git a/idea/testData/debugger/insertBeforeExtractFunction/manyImports.kt.fragment b/idea/testData/debugger/insertBeforeExtractFunction/manyImports.kt.fragment deleted file mode 100644 index 7defc218d28..00000000000 --- a/idea/testData/debugger/insertBeforeExtractFunction/manyImports.kt.fragment +++ /dev/null @@ -1,4 +0,0 @@ -import a -import b - -1 + 1 \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractBeforeExtractFunctionInsertionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractBeforeExtractFunctionInsertionTest.kt deleted file mode 100644 index 1d343d195b4..00000000000 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractBeforeExtractFunctionInsertionTest.kt +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license - * that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.debugger - -import com.intellij.openapi.application.ApplicationManager -import com.intellij.openapi.application.runReadAction -import com.intellij.openapi.util.io.FileUtil -import com.intellij.testFramework.LightCodeInsightTestCase -import com.intellij.testFramework.LightPlatformCodeInsightTestCase -import org.jetbrains.kotlin.idea.refactoring.getLineNumber -import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinCodeFragmentFactory -import org.jetbrains.kotlin.idea.debugger.evaluate.addDebugExpressionIntoTmpFileForExtractFunction -import org.jetbrains.kotlin.psi.KtExpression -import org.jetbrains.kotlin.psi.KtExpressionCodeFragment -import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.test.KotlinTestUtils -import java.io.File -import java.util.concurrent.Callable - -abstract class AbstractBeforeExtractFunctionInsertionTest : LightCodeInsightTestCase() { - - fun doTest(path: String) { - configureByFile(path) - - val offset = LightPlatformCodeInsightTestCase.getEditor().caretModel.offset - val elementAt = KotlinCodeFragmentFactory.getContextElement(myFile.findElementAt(offset)) ?: throw AssertionError() - val line = elementAt.getLineNumber() - - val fragmentFile = KotlinTestUtils.createFile("${myFile.name}fragment.kt", FileUtil.loadFile(File(path + ".fragment"), true), getProject()) - - val imports = fragmentFile.importList?.text ?: "" - val allText = fragmentFile.text - val fragmentText = if (imports.isBlank()) allText else allText.substringAfter(imports, allText) - - val expressionList = ApplicationManager.getApplication().executeOnPooledThread(Callable> { - runReadAction { - addDebugExpressionIntoTmpFileForExtractFunction( - myFile as KtFile, - KtExpressionCodeFragment(getProject(), "fragment.kt", fragmentText, imports, elementAt), - line) - } - }).get() - - KotlinTestUtils.assertEqualsToFile(File(path + ".after"), expressionList.first().containingFile.text) - } - - override fun getTestDataPath(): String { - return "" - } -} diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/BeforeExtractFunctionInsertionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/BeforeExtractFunctionInsertionTestGenerated.java deleted file mode 100644 index 59a3f85bdb7..00000000000 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/BeforeExtractFunctionInsertionTestGenerated.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license - * that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.debugger; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TargetBackend; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.runner.RunWith; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("idea/testData/debugger/insertBeforeExtractFunction") -@TestDataPath("$PROJECT_ROOT") -@RunWith(JUnit3RunnerWithInners.class) -public class BeforeExtractFunctionInsertionTestGenerated extends AbstractBeforeExtractFunctionInsertionTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); - } - - public void testAllFilesPresentInInsertBeforeExtractFunction() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/insertBeforeExtractFunction"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); - } - - @TestMetadata("emptyImportDirective.kt") - public void testEmptyImportDirective() throws Exception { - runTest("idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective.kt"); - } - - @TestMetadata("emptyImportDirective2.kt") - public void testEmptyImportDirective2() throws Exception { - runTest("idea/testData/debugger/insertBeforeExtractFunction/emptyImportDirective2.kt"); - } - - @TestMetadata("emptyPackageDirective.kt") - public void testEmptyPackageDirective() throws Exception { - runTest("idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective.kt"); - } - - @TestMetadata("emptyPackageDirective2.kt") - public void testEmptyPackageDirective2() throws Exception { - runTest("idea/testData/debugger/insertBeforeExtractFunction/emptyPackageDirective2.kt"); - } - - @TestMetadata("manyImports.kt") - public void testManyImports() throws Exception { - runTest("idea/testData/debugger/insertBeforeExtractFunction/manyImports.kt"); - } -}