rename/move empty package as directory: correct refs on dir itself

java/java-tests/testData/refactoring/movePackageAsDir/xmlEmptyDirRefs/after/src2/pack1/S2.java

@@ -0,0 +1,3 @@
+package pack1;
+
+public class S2{}

java/java-tests/testData/refactoring/movePackageAsDir/xmlEmptyDirRefs/after/src2/pack2/u.xml

@@ -0,0 +1,3 @@
+<root xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="../../src1/target/pack1" xpointer="xpointer(/components/*)"/>
+</root>

java/java-tests/testData/refactoring/movePackageAsDir/xmlEmptyDirRefs/before/src2/pack1/S2.java

@@ -0,0 +1,3 @@
+package pack1;
+
+public class S2{}

java/java-tests/testData/refactoring/movePackageAsDir/xmlEmptyDirRefs/before/src2/pack2/u.xml

@@ -0,0 +1,3 @@
+<root xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="../../src1/pack1" xpointer="xpointer(/components/*)"/>
+</root>

java/java-tests/testSrc/com/intellij/refactoring/MovePackageAsDirectoryTest.java

@@ -11,9 +11,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileAdapter;
 import com.intellij.openapi.vfs.VirtualFileEvent;
 import com.intellij.openapi.vfs.VirtualFileManager;
-import com.intellij.psi.JavaPsiFacade;
-import com.intellij.psi.PsiDirectory;
-import com.intellij.psi.PsiPackage;
+import com.intellij.psi.*;
 import com.intellij.refactoring.move.moveClassesOrPackages.MoveDirectoryWithClassesProcessor;
 import junit.framework.Assert;
 
@@ -67,34 +65,28 @@ public class MovePackageAsDirectoryTest extends MultiFileTestCase {
     doTest(createAction("pack1", "target"));
   }
 
-  private PerformAction createAction(final String packageName, final String targetPackageName) {
-    return new PerformAction() {
+  public void testXmlEmptyDirRefs() throws Exception {
+    final String packageName = "pack1";
+    doTest(new MyPerformAction(packageName, "target"){
+      private static final String EMPTY_TXT = "empty.txt";
       @Override
-      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception {
-        final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(myProject);
-        final Comparator<PsiDirectory> directoryComparator = new Comparator<PsiDirectory>() {
-          @Override
-          public int compare(PsiDirectory o1, PsiDirectory o2) {
-            return o1.getVirtualFile().getPresentableUrl().compareTo(o2.getVirtualFile().getPresentableUrl());
-          }
-        };
-
-        final PsiPackage sourcePackage = psiFacade.findPackage(packageName);
-        assertNotNull(sourcePackage);
-        final PsiDirectory[] srcDirectories = sourcePackage.getDirectories();
-        assertEquals(srcDirectories.length, 2);
-        Arrays.sort(srcDirectories, directoryComparator);
-
-        final PsiPackage targetPackage = psiFacade.findPackage(targetPackageName);
-        assertNotNull(targetPackage);
-        final PsiDirectory[] targetDirectories = targetPackage.getDirectories();
-        Arrays.sort(targetDirectories, directoryComparator);
-        assertTrue(targetDirectories.length > 0);
-
-        new MoveDirectoryWithClassesProcessor(getProject(), new PsiDirectory[]{srcDirectories[0]}, targetDirectories[0], false, false, true, null).run();
-        FileDocumentManager.getInstance().saveAllDocuments();
+      protected void preprocessSrcDir(PsiDirectory srcDirectory) {
+        final PsiFile empty = srcDirectory.findFile(EMPTY_TXT);
+        assert empty != null;
+        empty.delete();
       }
-    };
+
+      @Override
+      protected void postProcessTargetDir(PsiDirectory targetDirectory) {
+        final PsiDirectory subdirectory = targetDirectory.findSubdirectory(packageName);
+        assert subdirectory != null;
+        subdirectory.createFile(EMPTY_TXT);
+      }
+    });
+  }
+
+  private PerformAction createAction(final String packageName, final String targetPackageName) {
+    return new MyPerformAction(packageName, targetPackageName);
   }
 
   @Override
@@ -115,4 +107,47 @@ public class MovePackageAsDirectoryTest extends MultiFileTestCase {
       }
     });
   }
+
+  private class MyPerformAction implements PerformAction {
+    private final String myPackageName;
+    private final String myTargetPackageName;
+
+    public MyPerformAction(String packageName, String targetPackageName) {
+      myPackageName = packageName;
+      myTargetPackageName = targetPackageName;
+    }
+
+    @Override
+    public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception {
+      final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(myProject);
+      final Comparator<PsiDirectory> directoryComparator = new Comparator<PsiDirectory>() {
+        @Override
+        public int compare(PsiDirectory o1, PsiDirectory o2) {
+          return o1.getVirtualFile().getPresentableUrl().compareTo(o2.getVirtualFile().getPresentableUrl());
+        }
+      };
+
+      final PsiPackage sourcePackage = psiFacade.findPackage(myPackageName);
+      assertNotNull(sourcePackage);
+      final PsiDirectory[] srcDirectories = sourcePackage.getDirectories();
+      assertEquals(srcDirectories.length, 2);
+      Arrays.sort(srcDirectories, directoryComparator);
+
+      final PsiPackage targetPackage = psiFacade.findPackage(myTargetPackageName);
+      assertNotNull(targetPackage);
+      final PsiDirectory[] targetDirectories = targetPackage.getDirectories();
+      Arrays.sort(targetDirectories, directoryComparator);
+      assertTrue(targetDirectories.length > 0);
+      preprocessSrcDir(srcDirectories[0]);
+      new MoveDirectoryWithClassesProcessor(getProject(), new PsiDirectory[]{srcDirectories[0]}, targetDirectories[0], false, false, true, null).run();
+      postProcessTargetDir(targetDirectories[0]);
+      FileDocumentManager.getInstance().saveAllDocuments();
+    }
+
+    protected void postProcessTargetDir(PsiDirectory targetDirectory) {
+    }
+
+    protected void preprocessSrcDir(PsiDirectory srcDirectory) {
+    }
+  }
 }