less perforce output

2026-09-27 10:03:11 +07:00 · 2012-06-20 11:46:10 +04:00
parent 1852e3739f
commit c364a9fb5d
37 changed files with 99 additions and 80 deletions
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2010 JetBrains s.r.o.
+ * Copyright 2000-2012 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.
@@ -13,16 +13,27 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.intellij.testFramework;
+package com.intellij.testFramework.vcs;

 import org.junit.Rule;
 import org.junit.rules.TestName;
+import org.junit.runner.Description;

 public abstract class AbstractJunitVcsTestCase extends AbstractVcsTestCase {
+  private boolean succeeded = true;
  @Rule
-  public TestName name= new TestName();
+  public TestName name= new TestName(){
+    @Override
+    protected void failed(Throwable e, Description description) {
+      succeeded = false;
+    }
+  };

  protected String getTestName() {
    return name.getMethodName();
  }
+
+  public boolean isSucceeded() {
+    return succeeded;
+  }
 }
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.intellij.testFramework;
+package com.intellij.testFramework.vcs;

 import com.intellij.execution.process.CapturingProcessHandler;
 import com.intellij.execution.process.ProcessOutput;
@@ -32,6 +32,7 @@ import com.intellij.openapi.vfs.CharsetToolkit;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiNamedElement;
+import com.intellij.testFramework.UsefulTestCase;
 import com.intellij.testFramework.builders.EmptyModuleFixtureBuilder;
 import com.intellij.testFramework.fixtures.IdeaProjectTestFixture;
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory;
@@ -13,17 +13,14 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.intellij.openapi.vcs.changes.pending;
+package com.intellij.testFramework.vcs;

 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Getter;
 import com.intellij.openapi.vcs.AbstractVcs;
 import com.intellij.openapi.vcs.ProjectLevelVcsManager;
 import com.intellij.openapi.vcs.VcsDirectoryMapping;
-import com.intellij.openapi.vcs.changes.Change;
-import com.intellij.openapi.vcs.changes.ChangeListManager;
-import com.intellij.openapi.vcs.changes.LocalChangeList;
-import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
+import com.intellij.openapi.vcs.changes.*;
 import com.intellij.openapi.vcs.changes.committed.MockAbstractVcs;
 import com.intellij.openapi.vcs.changes.committed.MockDelayingChangeProvider;
 import com.intellij.openapi.vcs.impl.ProjectLevelVcsManagerImpl;
@@ -76,12 +73,12 @@ public class DuringChangeListManagerUpdateTestScheme {
    myChangeProvider.setTest(test);
    waiter.setControlled(test);

-    System.out.println("Starting delayed update..");
+    ChangeListManagerImpl.log("Starting delayed update..");
    myDirtyScopeManager.markEverythingDirty();
    myClManager.ensureUpToDate(false);
-    System.out.println("Starting timeout..");
+    ChangeListManagerImpl.log("Starting timeout..");
    waiter.startTimeout();
-    System.out.println("Timeout waiter completed.");
+    ChangeListManagerImpl.log("Timeout waiter completed.");

    if (test.getException() != null) {
      test.getException().printStackTrace();
@@ -101,7 +98,7 @@ public class DuringChangeListManagerUpdateTestScheme {
    }

    public void run() {
-      System.out.println("DuringUpdateTest: before test execution");
+      ChangeListManagerImpl.log("DuringUpdateTest: before test execution");
      try {
        myRunnable.run();
      }
@@ -109,7 +106,7 @@ public class DuringChangeListManagerUpdateTestScheme {
        myException = e;
      }

-      System.out.println("DuringUpdateTest: setting done");
+      ChangeListManagerImpl.log("DuringUpdateTest: setting done");
      myDone = myException == null;

      myChangeProvider.setTest(null);
@@ -133,7 +130,7 @@ public class DuringChangeListManagerUpdateTestScheme {
  }

  public static void checkFilesAreInList(final String listName, final ChangeListManager manager, final VirtualFile... files) {
-    System.out.println("Checking files for list: " + listName);
+    ChangeListManagerImpl.log("Checking files for list: " + listName);
    assert manager.findChangeList(listName) != null;
    final LocalChangeList list = manager.findChangeList(listName);
    final Collection<Change> changes = list.getChanges();
@@ -153,7 +150,7 @@ public class DuringChangeListManagerUpdateTestScheme {
  }

  public static void checkDeletedFilesAreInList(final VirtualFile[] files, final String listName, final ChangeListManager manager) {
-    System.out.println("Checking files for list: " + listName);
+    ChangeListManagerImpl.log("Checking files for list: " + listName);
    assert manager.findChangeList(listName) != null;
    final LocalChangeList list = manager.findChangeList(listName);
    final Collection<Change> changes = list.getChanges();
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.intellij.openapi.vcs.changes.pending;
+package com.intellij.testFramework.vcs;

 import com.intellij.openapi.vcs.FilePath;
 import com.intellij.openapi.vcs.FileStatus;
@@ -13,12 +13,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.intellij.testFramework;
+package com.intellij.testFramework.vcs;

 import com.intellij.execution.process.CapturingProcessHandler;
 import com.intellij.execution.process.ProcessOutput;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.vcs.changes.ChangeListManagerImpl;
 import com.intellij.openapi.vfs.CharsetToolkit;
 import org.jetbrains.annotations.Nullable;

@@ -57,9 +58,9 @@ public class TestClientRunner {
    }
    Collections.addAll(arguments, commandLine);
    if (myTraceClient) {
-      System.out.println("*** running:\n" + arguments);
+      ChangeListManagerImpl.log("*** running:\n" + arguments);
      if (StringUtil.isNotEmpty(stdin)) {
-        System.out.println("*** stdin:\n" + stdin);
+        ChangeListManagerImpl.log("*** stdin:\n" + stdin);
      }
    }
    final ProcessBuilder builder = new ProcessBuilder().command(arguments);
@@ -82,14 +83,14 @@ public class TestClientRunner {
    CapturingProcessHandler handler = new CapturingProcessHandler(clientProcess, CharsetToolkit.getDefaultSystemCharset());
    ProcessOutput result = handler.runProcess(60*1000);
    if (myTraceClient || result.isTimeout()) {
-      System.out.println("*** result: " + result.getExitCode());
+      ChangeListManagerImpl.log("*** result: " + result.getExitCode());
      final String out = result.getStdout().trim();
      if (out.length() > 0) {
-        System.out.println("*** output:\n" + out);
+        ChangeListManagerImpl.log("*** output:\n" + out);
      }
      final String err = result.getStderr().trim();
      if (err.length() > 0) {
-        System.out.println("*** error:\n" + err);
+        ChangeListManagerImpl.log("*** error:\n" + err);
      }
    }
    if (result.isTimeout()) {
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.intellij.openapi.vcs.changes.pending;
+package com.intellij.testFramework.vcs;

 import com.intellij.openapi.util.Getter;

@@ -70,7 +70,6 @@ import java.util.concurrent.atomic.AtomicReference;
 */
 public class ChangeListManagerImpl extends ChangeListManagerEx implements ProjectComponent, ChangeListOwner, JDOMExternalizable {
  public static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.ChangeListManagerImpl");
-  public static boolean DEBUG = false;

  private final Project myProject;
  private final ChangesViewI myChangesViewManager;
@@ -521,7 +520,7 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec

    for (final VcsDirtyScope scope : scopes) {
      if (DEBUG) {
-        System.out.println("ChangeListManagerImpl.iterateScopes: scope = " + scope);
+        ChangeListManagerImpl.log("ChangeListManagerImpl.iterateScopes: scope = " + scope);
      }
      myUpdateChangesProgressIndicator.checkCanceled();

@@ -1433,4 +1432,19 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec
    }
    return freezeReason != null;
  }
+
+  public static boolean DEBUG = false;
+  private static final StringBuffer log = new StringBuffer();
+  @TestOnly
+  public static void clearLog() {
+    log.setLength(0);
+  }
+  @TestOnly
+  public static void printLog() {
+    System.out.println(log);
+  }
+  @TestOnly
+  public static void log(Object o) {
+    log.append(o+"\n");
+  }
 }
@@ -217,7 +217,7 @@ public class ChangeListWorker implements ChangeListsWriteOperations {
      newList.startProcessingChanges(myProject, null);      // this is executed only when use through GATE
    }
    if (ChangeListManagerImpl.DEBUG) {
-      System.out.println("ChangeListWorker.addChangeList: " + newList);
+      ChangeListManagerImpl.log("ChangeListWorker.addChangeList: " + newList);
    }
    return newList.copy();
  }
@@ -268,7 +268,7 @@ public class ChangeListWorker implements ChangeListsWriteOperations {

    final LocalChangeList removed = myMap.remove(listName);
    if (ChangeListManagerImpl.DEBUG) {
-      System.out.println("ChangeListWorker.removeChangeList: name = [" + name + "], removed = " + removed);
+      ChangeListManagerImpl.log("ChangeListWorker.removeChangeList: name = [" + name + "], removed = " + removed);
    }
    return true;
  }
@@ -94,8 +94,8 @@ public class LastUnchangedContentTracker {
    LOG.assertTrue(contentId > 0, contentId);

    if (ChangeListManagerImpl.DEBUG) {
-      System.out.println("LastUnchangedContentTracker.saveContentReference");
-      System.out.println("file = " + file);
+      ChangeListManagerImpl.log("LastUnchangedContentTracker.saveContentReference");
+      ChangeListManagerImpl.log("file = " + file);
    }

    long stamp = file.getModificationStamp();
@@ -113,7 +113,7 @@ public class LocalChangeListImpl extends LocalChangeList {

  void addChange(Change change) {
    if (ChangeListManagerImpl.DEBUG) {
-      System.out.println("LocalChangeListImpl.addChange: this = " + this + ", change = " + change);
+      ChangeListManagerImpl.log("LocalChangeListImpl.addChange: this = " + this + ", change = " + change);
    }
    myReadChangesCache = null;
    myChanges.add(change);
@@ -121,8 +121,8 @@ public class LocalChangeListImpl extends LocalChangeList {

  Change removeChange(Change change) {
    if (ChangeListManagerImpl.DEBUG) {
-      System.out.println("LocalChangeListImpl.removeChange: this = " + this + ", change = " + change);
-      System.out.println("myChanges.size() = " + myChanges.size());
+      ChangeListManagerImpl.log("LocalChangeListImpl.removeChange: this = " + this + ", change = " + change);
+      ChangeListManagerImpl.log("myChanges.size() = " + myChanges.size());
    }
    for (Change localChange : myChanges) {
      if (localChange.equals(change)) {
@@ -146,7 +146,7 @@ public class LocalChangeListImpl extends LocalChangeList {
        || isIgnoredChange(oldBoy, fileIndex)) {
        result.add(oldBoy);
        if (ChangeListManagerImpl.DEBUG) {
-          System.out.println("LocalChangeListImpl.startProcessingChanges, remove old change: this = " + this + ", change = " + oldBoy);
+          ChangeListManagerImpl.log("LocalChangeListImpl.startProcessingChanges, remove old change: this = " + this + ", change = " + oldBoy);
        }
        myChanges.remove(oldBoy);
        myReadChangesCache = null;
@@ -103,7 +103,7 @@ public class UpdateRequestsQueue {
      if (! myStopped) {
        if (! myRequestSubmitted) {
          if (ChangeListManagerImpl.DEBUG) {
-            System.out.println("UpdateRequestsQueue.schedule");
+            ChangeListManagerImpl.log("UpdateRequestsQueue.schedule");
          }
          final MyRunnable runnable = new MyRunnable();
          myRequestSubmitted = true;
@@ -145,7 +145,7 @@ public class UpdateRequestsQueue {

  public void waitUntilRefreshed() {
    if (ChangeListManagerImpl.DEBUG) {
-      System.out.println("UpdateRequestsQueue.waitUntilRefreshed");
+      ChangeListManagerImpl.log("UpdateRequestsQueue.waitUntilRefreshed");
    }

    try {
@@ -167,7 +167,7 @@ public class UpdateRequestsQueue {
    }
    finally {
      if (ChangeListManagerImpl.DEBUG) {
-        System.out.println(" - end - UpdateRequestsQueue.waitUntilRefreshed");
+        ChangeListManagerImpl.log(" - end - UpdateRequestsQueue.waitUntilRefreshed");
      }
    }
  }
@@ -262,12 +262,12 @@ public class UpdateRequestsQueue {

        LOG.debug("MyRunnable: INVOKE, project: " + myProject.getName() + ", runnable: " + hashCode());
        if (ChangeListManagerImpl.DEBUG) {
-          System.out.println("UpdateRequestsQueue$MyRunnable.run");
+          ChangeListManagerImpl.log("UpdateRequestsQueue$MyRunnable.run");
        }

        myDelegate.run();
        if (ChangeListManagerImpl.DEBUG) {
-          System.out.println(" - end - UpdateRequestsQueue$MyRunnable.run");
+          ChangeListManagerImpl.log(" - end - UpdateRequestsQueue$MyRunnable.run");
        }
        LOG.debug("MyRunnable: invokeD, project: " + myProject.getName() + ", runnable: " + hashCode());
      } finally {
@@ -71,7 +71,7 @@ class UpdatingChangeListBuilder implements ChangelistBuilder {

  public void processChangeInList(final Change change, @Nullable final ChangeList changeList, final VcsKey vcsKey) {
    if (ChangeListManagerImpl.DEBUG) {
-      System.out.println("UpdatingChangeListBuilder.processChangeInList: change = [" + change + "], changeList = [" + changeList + "], vcsKey = [" + vcsKey + "]");
+      ChangeListManagerImpl.log("UpdatingChangeListBuilder.processChangeInList: change = [" + change + "], changeList = [" + changeList + "], vcsKey = [" + vcsKey + "]");
    }

    checkIfDisposed();
@@ -130,8 +130,8 @@ class UpdatingChangeListBuilder implements ChangelistBuilder {

  public void processUnversionedFile(final VirtualFile file) {
    if (ChangeListManagerImpl.DEBUG) {
-      System.out.println("UpdatingChangeListBuilder.processUnversionedFile");
-      System.out.println("file = " + file);
+      ChangeListManagerImpl.log("UpdatingChangeListBuilder.processUnversionedFile");
+      ChangeListManagerImpl.log("file = " + file);
    }
    if (file == null) return;
    checkIfDisposed();
@@ -170,8 +170,8 @@ class UpdatingChangeListBuilder implements ChangelistBuilder {
    if (isExcluded(file)) return;
    if (myScope.belongsTo(new FilePathImpl(file))) {
      if (ChangeListManagerImpl.DEBUG) {
-        System.out.println("UpdatingChangeListBuilder.processModifiedWithoutCheckout");
-        System.out.println("file = " + file);
+        ChangeListManagerImpl.log("UpdatingChangeListBuilder.processModifiedWithoutCheckout");
+        ChangeListManagerImpl.log("file = " + file);
      }
      myComposite.getVFHolder(FileHolder.HolderType.MODIFIED_WITHOUT_EDITING).addFile(file);
    }
@@ -17,10 +17,7 @@ package com.intellij.openapi.vcs.changes.committed;

 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.vcs.VcsException;
-import com.intellij.openapi.vcs.changes.ChangeListManagerGate;
-import com.intellij.openapi.vcs.changes.ChangeProvider;
-import com.intellij.openapi.vcs.changes.ChangelistBuilder;
-import com.intellij.openapi.vcs.changes.VcsDirtyScope;
+import com.intellij.openapi.vcs.changes.*;
 import com.intellij.openapi.vfs.VirtualFile;

 import java.util.List;
@@ -39,12 +36,12 @@ public class MockDelayingChangeProvider implements ChangeProvider {
    throws VcsException {
    synchronized (myLock) {
      if (myExecuteInsideUpdate == null) {
-        System.out.println("MockDelayingChangeProvider: getChanges, no test set");
+        ChangeListManagerImpl.log("MockDelayingChangeProvider: getChanges, no test set");
        return;
      }

      myLocked = true;
-      System.out.println("MockDelayingChangeProvider: getChanges, starting test thread...");
+      ChangeListManagerImpl.log("MockDelayingChangeProvider: getChanges, starting test thread...");
      myExecuteInsideUpdate.start();

      while (myLocked) {
@@ -55,12 +52,12 @@ public class MockDelayingChangeProvider implements ChangeProvider {
          //
        }
      }
-      System.out.println("MockDelayingChangeProvider: unlocked");
+      ChangeListManagerImpl.log("MockDelayingChangeProvider: unlocked");
    }
  }

  public void setTest(final Runnable runnable) {
-    System.out.println("MockDelayingChangeProvider: setTest " + (runnable == null ? "(null)" : "(not null)"));
+    ChangeListManagerImpl.log("MockDelayingChangeProvider: setTest " + (runnable == null ? "(null)" : "(not null)"));
    synchronized (myLock) {
      if (runnable == null) {
        myExecuteInsideUpdate = null;
@@ -79,7 +76,7 @@ public class MockDelayingChangeProvider implements ChangeProvider {

  public void unlock() {
    synchronized (myLock) {
-      System.out.println("MockDelayingChangeProvider: unlocking");
+      ChangeListManagerImpl.log("MockDelayingChangeProvider: unlocking");
      myLocked = false;
      myLock.notifyAll();
    }
@@ -11,7 +11,7 @@ import com.intellij.openapi.vcs.ProjectLevelVcsManager;
 import com.intellij.openapi.vcs.VcsConfiguration;
 import com.intellij.openapi.vcs.VcsShowConfirmationOption;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.testFramework.AbstractVcsTestCase;
+import com.intellij.testFramework.vcs.AbstractVcsTestCase;
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory;
 import com.intellij.testFramework.fixtures.TempDirTestFixture;
 import com.intellij.util.ui.UIUtil;
@@ -18,7 +18,7 @@ package git4idea.test;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.testFramework.AbstractVcsTestCase;
+import com.intellij.testFramework.vcs.AbstractVcsTestCase;
 import com.intellij.testFramework.VfsTestUtil;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.ui.UIUtil;
@@ -20,7 +20,7 @@ import com.intellij.openapi.vcs.*;
 import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
 import com.intellij.openapi.vcs.changes.VcsModifiableDirtyScope;
-import com.intellij.openapi.vcs.changes.pending.MockChangeListManagerGate;
+import com.intellij.testFramework.vcs.MockChangeListManagerGate;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.testFramework.vcs.MockChangelistBuilder;
 import com.intellij.testFramework.vcs.MockDirtyScope;
@@ -22,7 +22,7 @@ import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.VcsShowConfirmationOption;
 import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
-import com.intellij.openapi.vcs.changes.pending.MockChangeListManagerGate;
+import com.intellij.testFramework.vcs.MockChangeListManagerGate;
 import com.intellij.openapi.vcs.changes.ui.RollbackProgressModifier;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.testFramework.vcs.MockChangelistBuilder;
@@ -21,7 +21,7 @@ import com.intellij.openapi.vcs.VcsConfiguration;
 import com.intellij.openapi.vcs.VcsShowConfirmationOption;
 import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.ContentRevision;
-import com.intellij.testFramework.AbstractVcsTestCase;
+import com.intellij.testFramework.vcs.AbstractVcsTestCase;
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory;
 import com.intellij.testFramework.fixtures.TempDirTestFixture;
 import com.intellij.ui.GuiUtils;
@@ -19,7 +19,7 @@ import com.intellij.openapi.vcs.VcsConfiguration;
 import com.intellij.openapi.vcs.VcsShowConfirmationOption;
 import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.testFramework.AbstractVcsTestCase;
+import com.intellij.testFramework.vcs.AbstractVcsTestCase;
 import com.intellij.ui.GuiUtils;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.vcsUtil.VcsUtil;
@@ -17,7 +17,7 @@ package org.zmlx.hg4idea.test;

 import com.intellij.execution.process.ProcessOutput;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.testFramework.AbstractVcsTestCase;
+import com.intellij.testFramework.vcs.AbstractVcsTestCase;
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory;
 import com.intellij.testFramework.fixtures.TempDirTestFixture;
 import com.intellij.vcsUtil.VcsUtil;
@@ -22,7 +22,7 @@ import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
 import com.intellij.openapi.vcs.changes.ChangeListManagerImpl;
 import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
-import com.intellij.openapi.vcs.changes.pending.DuringChangeListManagerUpdateTestScheme;
+import com.intellij.testFramework.vcs.DuringChangeListManagerUpdateTestScheme;
 import com.intellij.openapi.vcs.changes.ui.RollbackWorker;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VfsUtil;
@@ -17,8 +17,8 @@ package org.jetbrains.idea.svn;

 import com.intellij.execution.process.ProcessOutput;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.testFramework.AbstractVcsTestCase;
-import com.intellij.testFramework.TestClientRunner;
+import com.intellij.testFramework.vcs.AbstractVcsTestCase;
+import com.intellij.testFramework.vcs.TestClientRunner;

 import java.io.File;
 import java.io.IOException;
@@ -6,7 +6,7 @@ import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
 import com.intellij.openapi.vcs.changes.LocalChangeList;
 import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
-import com.intellij.openapi.vcs.changes.pending.DuringChangeListManagerUpdateTestScheme;
+import com.intellij.testFramework.vcs.DuringChangeListManagerUpdateTestScheme;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.junit.Test;

@@ -25,7 +25,7 @@ import com.intellij.openapi.vcs.changes.ChangeListManager;
 import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.testFramework.TestClientRunner;
+import com.intellij.testFramework.vcs.TestClientRunner;
 import com.intellij.util.Processor;
 import junit.framework.Assert;
 import org.jetbrains.idea.svn.treeConflict.SvnTreeConflictResolver;
@@ -32,11 +32,11 @@ import com.intellij.openapi.vcs.VcsConfiguration;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.VcsShowConfirmationOption;
 import com.intellij.openapi.vcs.changes.*;
-import com.intellij.openapi.vcs.changes.pending.MockChangeListManagerGate;
+import com.intellij.testFramework.vcs.MockChangeListManagerGate;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.testFramework.AbstractJunitVcsTestCase;
+import com.intellij.testFramework.vcs.AbstractJunitVcsTestCase;
 import com.intellij.testFramework.PlatformTestCase;
-import com.intellij.testFramework.TestClientRunner;
+import com.intellij.testFramework.vcs.TestClientRunner;
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory;
 import com.intellij.testFramework.fixtures.TempDirTestFixture;
 import com.intellij.testFramework.vcs.MockChangelistBuilder;
@@ -15,16 +15,14 @@
 */
 package org.jetbrains.idea.svn;

-import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vcs.FilePathImpl;
-import com.intellij.openapi.vcs.FileStatus;
 import com.intellij.openapi.vcs.VcsConfiguration;
 import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
 import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.testFramework.TestClientRunner;
+import com.intellij.testFramework.vcs.TestClientRunner;
 import junit.framework.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -22,7 +22,7 @@ import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
 import com.intellij.openapi.vcs.changes.ChangeListManagerImpl;
 import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
-import com.intellij.openapi.vcs.changes.pending.DuringChangeListManagerUpdateTestScheme;
+import com.intellij.testFramework.vcs.DuringChangeListManagerUpdateTestScheme;
 import com.intellij.openapi.vcs.changes.ui.RollbackWorker;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VfsUtil;
@@ -6,7 +6,7 @@ import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
 import com.intellij.openapi.vcs.changes.LocalChangeList;
 import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
-import com.intellij.openapi.vcs.changes.pending.DuringChangeListManagerUpdateTestScheme;
+import com.intellij.testFramework.vcs.DuringChangeListManagerUpdateTestScheme;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.junit.Test;

@@ -31,8 +31,8 @@ import com.intellij.openapi.vcs.VcsConfiguration;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.VcsShowConfirmationOption;
 import com.intellij.openapi.vcs.changes.*;
-import com.intellij.openapi.vcs.changes.pending.MockChangeListManagerGate;
-import com.intellij.testFramework.AbstractJunitVcsTestCase;
+import com.intellij.testFramework.vcs.MockChangeListManagerGate;
+import com.intellij.testFramework.vcs.AbstractJunitVcsTestCase;
 import com.intellij.testFramework.PlatformTestCase;
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory;
 import com.intellij.testFramework.fixtures.TempDirTestFixture;
@@ -13,7 +13,7 @@ import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
 import com.intellij.openapi.vcs.impl.ProjectLevelVcsManagerImpl;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.testFramework.AbstractVcsTestCase;
+import com.intellij.testFramework.vcs.AbstractVcsTestCase;
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory;
 import com.intellij.testFramework.fixtures.TempDirTestFixture;
 import com.intellij.util.ui.UIUtil;
@@ -22,7 +22,7 @@ import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
 import com.intellij.openapi.vcs.changes.ChangeListManagerImpl;
 import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
-import com.intellij.openapi.vcs.changes.pending.DuringChangeListManagerUpdateTestScheme;
+import com.intellij.testFramework.vcs.DuringChangeListManagerUpdateTestScheme;
 import com.intellij.openapi.vcs.changes.ui.RollbackWorker;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VfsUtil;
@@ -6,7 +6,7 @@ import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
 import com.intellij.openapi.vcs.changes.LocalChangeList;
 import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
-import com.intellij.openapi.vcs.changes.pending.DuringChangeListManagerUpdateTestScheme;
+import com.intellij.testFramework.vcs.DuringChangeListManagerUpdateTestScheme;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.junit.Test;

@@ -16,9 +16,9 @@ import com.intellij.openapi.vcs.VcsConfiguration;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.VcsShowConfirmationOption;
 import com.intellij.openapi.vcs.changes.*;
-import com.intellij.openapi.vcs.changes.pending.MockChangeListManagerGate;
+import com.intellij.testFramework.vcs.MockChangeListManagerGate;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.testFramework.AbstractVcsTestCase;
+import com.intellij.testFramework.vcs.AbstractVcsTestCase;
 import com.intellij.testFramework.PlatformTestCase;
 import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory;
 import com.intellij.testFramework.fixtures.TempDirTestFixture;