From c364a9fb5df7de50cd8ae2935bf57214dc07d80e Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 20 Jun 2012 11:40:35 +0400 Subject: [PATCH] less perforce output --- .../intellij/concurrency/JobLauncherImpl.java | 2 +- .../vcs}/AbstractJunitVcsTestCase.java | 15 +++++++++++-- .../vcs}/AbstractVcsTestCase.java | 3 ++- ...ringChangeListManagerUpdateTestScheme.java | 21 ++++++++----------- .../testFramework/vcs/MockChangeList.java | 0 .../vcs}/MockChangeListManagerGate.java | 2 +- .../vcs/MockChangelistBuilder.java | 0 .../testFramework/vcs/MockDirtyScope.java | 0 .../testFramework/vcs}/TestClientRunner.java | 13 ++++++------ .../testFramework/vcs}/TimeoutWaiter.java | 2 +- .../vcs/changes/ChangeListManagerImpl.java | 18 ++++++++++++++-- .../openapi/vcs/changes/ChangeListWorker.java | 4 ++-- .../changes/LastUnchangedContentTracker.java | 4 ++-- .../vcs/changes/LocalChangeListImpl.java | 8 +++---- .../vcs/changes/UpdateRequestsQueue.java | 10 ++++----- .../changes/UpdatingChangeListBuilder.java | 10 ++++----- .../committed/MockDelayingChangeProvider.java | 15 ++++++------- .../branch/GitBranchOperationsTest.java | 2 +- .../git4idea/tests/git4idea/test/GitExec.java | 2 +- .../git4idea/tests/GitChangeProviderTest.java | 2 +- .../GitChangeProviderUnversionedTest.java | 2 +- .../tests/git4idea/tests/GitTest.java | 2 +- .../testSrc/org/zmlx/hg4idea/test/HgTest.java | 2 +- .../zmlx/hg4idea/test/HgTestRepository.java | 2 +- .../svn/SvnChangesCorrectlyRefreshedTest.java | 2 +- .../idea/svn/SvnClientRunnerImpl.java | 4 ++-- .../SvnConcurrentChangeListManagerTest.java | 2 +- .../svn/SvnResolveTreeAcceptVariantsTest.java | 2 +- .../org/jetbrains/idea/svn/SvnTestCase.java | 6 +++--- .../idea/svn/SvnTreeConflictDataTest.java | 4 +--- .../SvnChangesCorrectlyRefreshedTest.java | 2 +- .../SvnConcurrentChangeListManagerTest.java | 2 +- .../org/jetbrains/idea/svn16/SvnTestCase.java | 4 ++-- .../jetbrains/idea/svn/IgnoredFilesTest.java | 2 +- .../svn/SvnChangesCorrectlyRefreshedTest.java | 2 +- .../SvnConcurrentChangeListManagerTest.java | 2 +- .../org/jetbrains/idea/svn/SvnTestCase.java | 4 ++-- 37 files changed, 99 insertions(+), 80 deletions(-) rename platform/testFramework/{src/com/intellij/testFramework => testSrc/com/intellij/testFramework/vcs}/AbstractJunitVcsTestCase.java (71%) rename platform/testFramework/{src/com/intellij/testFramework => testSrc/com/intellij/testFramework/vcs}/AbstractVcsTestCase.java (99%) rename platform/{vcs-impl/src/com/intellij/openapi/vcs/changes/pending => testFramework/testSrc/com/intellij/testFramework/vcs}/DuringChangeListManagerUpdateTestScheme.java (90%) rename platform/testFramework/{src => testSrc}/com/intellij/testFramework/vcs/MockChangeList.java (100%) rename platform/{vcs-impl/src/com/intellij/openapi/vcs/changes/pending => testFramework/testSrc/com/intellij/testFramework/vcs}/MockChangeListManagerGate.java (98%) rename platform/testFramework/{src => testSrc}/com/intellij/testFramework/vcs/MockChangelistBuilder.java (100%) rename platform/testFramework/{src => testSrc}/com/intellij/testFramework/vcs/MockDirtyScope.java (100%) rename platform/testFramework/{src/com/intellij/testFramework => testSrc/com/intellij/testFramework/vcs}/TestClientRunner.java (88%) rename platform/{vcs-impl/src/com/intellij/openapi/vcs/changes/pending => testFramework/testSrc/com/intellij/testFramework/vcs}/TimeoutWaiter.java (96%) diff --git a/platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java b/platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java index e5910b81012e..77d73af0ddc4 100644 --- a/platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java +++ b/platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java @@ -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. diff --git a/platform/testFramework/src/com/intellij/testFramework/AbstractJunitVcsTestCase.java b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractJunitVcsTestCase.java similarity index 71% rename from platform/testFramework/src/com/intellij/testFramework/AbstractJunitVcsTestCase.java rename to platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractJunitVcsTestCase.java index ec85d371dfb1..30a32b2a16c8 100644 --- a/platform/testFramework/src/com/intellij/testFramework/AbstractJunitVcsTestCase.java +++ b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractJunitVcsTestCase.java @@ -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; + } } diff --git a/platform/testFramework/src/com/intellij/testFramework/AbstractVcsTestCase.java b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractVcsTestCase.java similarity index 99% rename from platform/testFramework/src/com/intellij/testFramework/AbstractVcsTestCase.java rename to platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractVcsTestCase.java index 15103cb5d6d8..96d0db9d8d74 100644 --- a/platform/testFramework/src/com/intellij/testFramework/AbstractVcsTestCase.java +++ b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/AbstractVcsTestCase.java @@ -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; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/pending/DuringChangeListManagerUpdateTestScheme.java b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/DuringChangeListManagerUpdateTestScheme.java similarity index 90% rename from platform/vcs-impl/src/com/intellij/openapi/vcs/changes/pending/DuringChangeListManagerUpdateTestScheme.java rename to platform/testFramework/testSrc/com/intellij/testFramework/vcs/DuringChangeListManagerUpdateTestScheme.java index 578ac75d7999..38549701c9a3 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/pending/DuringChangeListManagerUpdateTestScheme.java +++ b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/DuringChangeListManagerUpdateTestScheme.java @@ -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 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 changes = list.getChanges(); diff --git a/platform/testFramework/src/com/intellij/testFramework/vcs/MockChangeList.java b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeList.java similarity index 100% rename from platform/testFramework/src/com/intellij/testFramework/vcs/MockChangeList.java rename to platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeList.java diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/pending/MockChangeListManagerGate.java b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeListManagerGate.java similarity index 98% rename from platform/vcs-impl/src/com/intellij/openapi/vcs/changes/pending/MockChangeListManagerGate.java rename to platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeListManagerGate.java index 302e450d3e2d..73abf13f7ffc 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/pending/MockChangeListManagerGate.java +++ b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangeListManagerGate.java @@ -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; diff --git a/platform/testFramework/src/com/intellij/testFramework/vcs/MockChangelistBuilder.java b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangelistBuilder.java similarity index 100% rename from platform/testFramework/src/com/intellij/testFramework/vcs/MockChangelistBuilder.java rename to platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockChangelistBuilder.java diff --git a/platform/testFramework/src/com/intellij/testFramework/vcs/MockDirtyScope.java b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockDirtyScope.java similarity index 100% rename from platform/testFramework/src/com/intellij/testFramework/vcs/MockDirtyScope.java rename to platform/testFramework/testSrc/com/intellij/testFramework/vcs/MockDirtyScope.java diff --git a/platform/testFramework/src/com/intellij/testFramework/TestClientRunner.java b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/TestClientRunner.java similarity index 88% rename from platform/testFramework/src/com/intellij/testFramework/TestClientRunner.java rename to platform/testFramework/testSrc/com/intellij/testFramework/vcs/TestClientRunner.java index 44f0d5be8161..97946ea72638 100644 --- a/platform/testFramework/src/com/intellij/testFramework/TestClientRunner.java +++ b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/TestClientRunner.java @@ -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()) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/pending/TimeoutWaiter.java b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/TimeoutWaiter.java similarity index 96% rename from platform/vcs-impl/src/com/intellij/openapi/vcs/changes/pending/TimeoutWaiter.java rename to platform/testFramework/testSrc/com/intellij/testFramework/vcs/TimeoutWaiter.java index 4e397b708ff1..d3f23aa11248 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/pending/TimeoutWaiter.java +++ b/platform/testFramework/testSrc/com/intellij/testFramework/vcs/TimeoutWaiter.java @@ -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; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java index edc2b566f351..da54363c1d5f 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java @@ -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"); + } } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java index 4b5c406d756b..2fcf5e30449b 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java @@ -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; } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LastUnchangedContentTracker.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LastUnchangedContentTracker.java index 34fff6eb63b8..61d57dd02405 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LastUnchangedContentTracker.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LastUnchangedContentTracker.java @@ -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(); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java index b1de7e38155d..83915c5be316 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java @@ -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; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdateRequestsQueue.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdateRequestsQueue.java index 845d91999b55..17e46f90878b 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdateRequestsQueue.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdateRequestsQueue.java @@ -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 { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java index ac479025c591..3a1cd8e24d69 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java @@ -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); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/MockDelayingChangeProvider.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/MockDelayingChangeProvider.java index b2bbb8da6037..dded92bfe1f3 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/MockDelayingChangeProvider.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/MockDelayingChangeProvider.java @@ -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(); } diff --git a/plugins/git4idea/tests/git4idea/branch/GitBranchOperationsTest.java b/plugins/git4idea/tests/git4idea/branch/GitBranchOperationsTest.java index c02a68bd1c02..2e6d750c5034 100644 --- a/plugins/git4idea/tests/git4idea/branch/GitBranchOperationsTest.java +++ b/plugins/git4idea/tests/git4idea/branch/GitBranchOperationsTest.java @@ -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; diff --git a/plugins/git4idea/tests/git4idea/test/GitExec.java b/plugins/git4idea/tests/git4idea/test/GitExec.java index 08d063685281..9c2c08d23874 100644 --- a/plugins/git4idea/tests/git4idea/test/GitExec.java +++ b/plugins/git4idea/tests/git4idea/test/GitExec.java @@ -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; diff --git a/plugins/git4idea/tests/git4idea/tests/GitChangeProviderTest.java b/plugins/git4idea/tests/git4idea/tests/GitChangeProviderTest.java index eac7726cf963..373a6031b020 100644 --- a/plugins/git4idea/tests/git4idea/tests/GitChangeProviderTest.java +++ b/plugins/git4idea/tests/git4idea/tests/GitChangeProviderTest.java @@ -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; diff --git a/plugins/git4idea/tests/git4idea/tests/GitChangeProviderUnversionedTest.java b/plugins/git4idea/tests/git4idea/tests/GitChangeProviderUnversionedTest.java index 4d78012eeecd..4caa1540dd17 100644 --- a/plugins/git4idea/tests/git4idea/tests/GitChangeProviderUnversionedTest.java +++ b/plugins/git4idea/tests/git4idea/tests/GitChangeProviderUnversionedTest.java @@ -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; diff --git a/plugins/git4idea/tests/git4idea/tests/GitTest.java b/plugins/git4idea/tests/git4idea/tests/GitTest.java index 26f627a174b5..0a9218240af4 100644 --- a/plugins/git4idea/tests/git4idea/tests/GitTest.java +++ b/plugins/git4idea/tests/git4idea/tests/GitTest.java @@ -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; diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTest.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTest.java index 07b1bfb14974..e1d9bd4bcb15 100644 --- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTest.java +++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTest.java @@ -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; diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTestRepository.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTestRepository.java index 6fef1f384c14..e245ae0ba0d4 100644 --- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTestRepository.java +++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTestRepository.java @@ -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; diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnChangesCorrectlyRefreshedTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnChangesCorrectlyRefreshedTest.java index 2aecb58360f1..04b94c790036 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnChangesCorrectlyRefreshedTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnChangesCorrectlyRefreshedTest.java @@ -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; diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnClientRunnerImpl.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnClientRunnerImpl.java index 84bc95ebc379..eceaac98c4c4 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnClientRunnerImpl.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnClientRunnerImpl.java @@ -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; diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnConcurrentChangeListManagerTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnConcurrentChangeListManagerTest.java index 0978b3f821e1..315a4567c972 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnConcurrentChangeListManagerTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnConcurrentChangeListManagerTest.java @@ -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; diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnResolveTreeAcceptVariantsTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnResolveTreeAcceptVariantsTest.java index 7ba34a4fbc19..55b6e7b773eb 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnResolveTreeAcceptVariantsTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnResolveTreeAcceptVariantsTest.java @@ -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; diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java index ca7a6393433f..1dbf191bfe9b 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java @@ -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; diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java index c15ebdb13abe..702bc928dcea 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java @@ -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; diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnChangesCorrectlyRefreshedTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnChangesCorrectlyRefreshedTest.java index 450f1765f6c4..b56fc5410e10 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnChangesCorrectlyRefreshedTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnChangesCorrectlyRefreshedTest.java @@ -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; diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnConcurrentChangeListManagerTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnConcurrentChangeListManagerTest.java index 931d65adb631..bfb144702c89 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnConcurrentChangeListManagerTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnConcurrentChangeListManagerTest.java @@ -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; diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnTestCase.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnTestCase.java index d303f7aab74f..d4abe45b50bd 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnTestCase.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnTestCase.java @@ -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; diff --git a/plugins/svn4ideaOld/testSource/org/jetbrains/idea/svn/IgnoredFilesTest.java b/plugins/svn4ideaOld/testSource/org/jetbrains/idea/svn/IgnoredFilesTest.java index 5bef91e4b6e0..a2b7c1bc20da 100644 --- a/plugins/svn4ideaOld/testSource/org/jetbrains/idea/svn/IgnoredFilesTest.java +++ b/plugins/svn4ideaOld/testSource/org/jetbrains/idea/svn/IgnoredFilesTest.java @@ -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; diff --git a/plugins/svn4ideaOld/testSource/org/jetbrains/idea/svn/SvnChangesCorrectlyRefreshedTest.java b/plugins/svn4ideaOld/testSource/org/jetbrains/idea/svn/SvnChangesCorrectlyRefreshedTest.java index fbed7a8a9a7a..78a12c45d72a 100644 --- a/plugins/svn4ideaOld/testSource/org/jetbrains/idea/svn/SvnChangesCorrectlyRefreshedTest.java +++ b/plugins/svn4ideaOld/testSource/org/jetbrains/idea/svn/SvnChangesCorrectlyRefreshedTest.java @@ -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; diff --git a/plugins/svn4ideaOld/testSource/org/jetbrains/idea/svn/SvnConcurrentChangeListManagerTest.java b/plugins/svn4ideaOld/testSource/org/jetbrains/idea/svn/SvnConcurrentChangeListManagerTest.java index 0978b3f821e1..315a4567c972 100644 --- a/plugins/svn4ideaOld/testSource/org/jetbrains/idea/svn/SvnConcurrentChangeListManagerTest.java +++ b/plugins/svn4ideaOld/testSource/org/jetbrains/idea/svn/SvnConcurrentChangeListManagerTest.java @@ -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; diff --git a/plugins/svn4ideaOld/testSource/org/jetbrains/idea/svn/SvnTestCase.java b/plugins/svn4ideaOld/testSource/org/jetbrains/idea/svn/SvnTestCase.java index 4e06b57fffa3..90cc5ba928ad 100644 --- a/plugins/svn4ideaOld/testSource/org/jetbrains/idea/svn/SvnTestCase.java +++ b/plugins/svn4ideaOld/testSource/org/jetbrains/idea/svn/SvnTestCase.java @@ -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;