Added test with moving file used in Java to other package.

This commit is contained in:
Evgeny Gerashchenko
2015-03-31 18:11:46 +03:00
parent a4d2d6506c
commit 83f2a08708
9 changed files with 42 additions and 0 deletions
@@ -0,0 +1,8 @@
import newPackage.NewPackagePackage;
class JavaUsage {
public static void main(String[] args) {
NewPackagePackage.foo();
NewPackagePackage.getProp();
}
}
@@ -0,0 +1,6 @@
package newPackage
fun foo() {
}
var prop = ":)"
@@ -0,0 +1,8 @@
import oldPackage.OldPackagePackage;
class JavaUsage {
public static void main(String[] args) {
OldPackagePackage.foo();
OldPackagePackage.getProp();
}
}
@@ -0,0 +1,6 @@
package oldPackage
fun foo() {
}
var prop = ":)"
@@ -0,0 +1,5 @@
{
"mainFile": "oldPackage/stuff.kt",
"type": "MOVE_FILES",
"targetPackage": "newPackage"
}
@@ -33,6 +33,7 @@ import com.intellij.codeInsight.TargetElementUtilBase
import com.intellij.openapi.fileEditor.FileDocumentManager
import com.intellij.openapi.editor.EditorFactory
import com.intellij.openapi.editor.Document
import com.intellij.openapi.vfs.VfsUtil
import com.intellij.psi.PsiDocumentManager
import org.jetbrains.kotlin.test.JetTestUtils
import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesProcessor
@@ -46,6 +47,7 @@ import com.intellij.psi.PsiFile
import com.intellij.psi.PsiManager
import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesProcessor
import com.intellij.refactoring.move.MoveHandler
import com.intellij.util.ActionRunner
import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.MoveKotlinTopLevelDeclarationsProcessor
import org.jetbrains.kotlin.psi.JetNamedDeclaration
import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.MoveDestinationKotlinMoveTarget
@@ -233,6 +235,7 @@ enum class MoveAction {
val targetPackage = config.getNullableString("targetPackage")
if (targetPackage != null) {
ActionRunner.runInsideWriteAction { VfsUtil.createDirectoryIfMissing(rootDir, targetPackage.replace('.', '/')) }
MoveFilesOrDirectoriesProcessor(
project,
array(mainFile),
@@ -234,6 +234,12 @@ public class JetMoveTestGenerated extends AbstractJetMoveTest {
doTest(fileName);
}
@TestMetadata("kotlin/moveFile/moveLastFileInPackageWithPackageRename/moveLastFileInPackageWithPackageRename.test")
public void testKotlin_moveFile_moveLastFileInPackageWithPackageRename_MoveLastFileInPackageWithPackageRename() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveFile/moveLastFileInPackageWithPackageRename/moveLastFileInPackageWithPackageRename.test");
doTest(fileName);
}
@TestMetadata("kotlin/movePackage/movePackage/movePackage.test")
public void testKotlin_movePackage_movePackage_MovePackage() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/movePackage/movePackage/movePackage.test");