diff --git a/smalidea/src/test/java/org/jf/smalidea/ClassMoveTest.java b/smalidea/src/test/java/org/jf/smalidea/ClassMoveTest.java index 0edcc392..89d45451 100644 --- a/smalidea/src/test/java/org/jf/smalidea/ClassMoveTest.java +++ b/smalidea/src/test/java/org/jf/smalidea/ClassMoveTest.java @@ -3,13 +3,11 @@ package org.jf.smalidea; import com.intellij.openapi.roots.JavaProjectRootsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiClass; -import com.intellij.psi.PsiDirectory; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.refactoring.MultiFileTestCase; import com.intellij.refactoring.PackageWrapper; import com.intellij.refactoring.move.moveClassesOrPackages.AutocreatingSingleSourceRootMoveDestination; import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesProcessor; -import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesUtil; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -46,23 +44,12 @@ public class ClassMoveTest extends MultiFileTestCase { private void doMove(String oldQualifiedName, final String newPackage) throws Exception { final PsiClass testClass = myJavaFacade.findClass(oldQualifiedName, GlobalSearchScope.allScope(getProject())); - PsiDirectory newDirectory = MoveClassesOrPackagesUtil.chooseDestinationPackage(getProject(), - newPackage, testClass.getContainingFile().getContainingDirectory()); - final List contentSourceRoots = JavaProjectRootsUtil.getSuitableDestinationSourceRoots(getProject()); new MoveClassesOrPackagesProcessor(getProject(), new PsiClass[] {testClass}, new AutocreatingSingleSourceRootMoveDestination(new PackageWrapper(getPsiManager(), newPackage), contentSourceRoots.get(0)), false, false, null).run(); - - /*new WriteCommandAction.Simple(getProject(), testClass.getContainingFile()) { - @Override protected void run() throws Throwable { - - - MoveClassesOrPackagesUtil.doMoveClass(testClass, newDirectory); - } - }.execute();*/ } } diff --git a/smalidea/testData/classMove/basicToNoPackage/after/my/placeholder.smali b/smalidea/testData/classMove/basicToNoPackage/after/my/placeholder.smali new file mode 100644 index 00000000..02813447 --- /dev/null +++ b/smalidea/testData/classMove/basicToNoPackage/after/my/placeholder.smali @@ -0,0 +1,2 @@ +.class public Lmy/placeholder; +.super Ljava/lang/Object; \ No newline at end of file diff --git a/smalidea/testData/classMove/basicToNoPackage/before/my/placeholder.smali b/smalidea/testData/classMove/basicToNoPackage/before/my/placeholder.smali new file mode 100644 index 00000000..02813447 --- /dev/null +++ b/smalidea/testData/classMove/basicToNoPackage/before/my/placeholder.smali @@ -0,0 +1,2 @@ +.class public Lmy/placeholder; +.super Ljava/lang/Object; \ No newline at end of file