diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAnnotationIsClosedTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAnnotationIsClosedTest.java index afa4c3481465..a51cdaaf3c35 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAnnotationIsClosedTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAnnotationIsClosedTest.java @@ -1,15 +1,12 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.idea.svn; -import com.intellij.openapi.vcs.ProjectLevelVcsManager; import com.intellij.openapi.vcs.VcsConfiguration; import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vcs.VcsTestUtil; import com.intellij.openapi.vcs.annotate.FileAnnotation; import com.intellij.openapi.vcs.changes.Change; -import com.intellij.openapi.vcs.changes.ChangeListManager; import com.intellij.openapi.vcs.changes.VcsAnnotationLocalChangesListener; -import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager; import com.intellij.openapi.vcs.history.VcsRevisionDescription; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; @@ -25,15 +22,11 @@ import static org.junit.Assert.*; public class SvnAnnotationIsClosedTest extends SvnTestCase { private volatile boolean myIsClosed; private volatile boolean myIsClosed1; - private ChangeListManager myChangeListManager; - private VcsDirtyScopeManager myDirtyScopeManager; @Override @Before public void setUp() throws Exception { super.setUp(); - myChangeListManager = ChangeListManager.getInstance(myProject); - myDirtyScopeManager = VcsDirtyScopeManager.getInstance(myProject); enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD); enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE); myIsClosed = false; @@ -49,7 +42,7 @@ public class SvnAnnotationIsClosedTest extends SvnTestCase { VcsTestUtil.editFileInCommand(myProject, tree.myS1File, "1\n2\n3**\n4\n"); checkin(); - final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); + final VcsAnnotationLocalChangesListener listener = vcsManager.getAnnotationLocalChangesListener(); final FileAnnotation annotation = createTestAnnotation(vcs.getAnnotationProvider(), tree.myS1File); annotation.setCloser(() -> { myIsClosed = true; @@ -61,15 +54,15 @@ public class SvnAnnotationIsClosedTest extends SvnTestCase { assertFalse(myIsClosed); // not closed on typing refreshChanges(); - final Change change = myChangeListManager.getChange(tree.myS1File); + final Change change = changeListManager.getChange(tree.myS1File); assertNotNull(change); final List exceptions = vcs.getCheckinEnvironment().commit(Collections.singletonList(change), "commit"); assertTrue(exceptions == null || exceptions.isEmpty()); - myDirtyScopeManager.fileDirty(tree.myS1File); + dirtyScopeManager.fileDirty(tree.myS1File); - myChangeListManager.ensureUpToDate(false); - myChangeListManager.ensureUpToDate(false); // wait for after-events like annotations recalculation + changeListManager.ensureUpToDate(false); + changeListManager.ensureUpToDate(false); // wait for after-events like annotations recalculation sleep(100); // zipper updater assertTrue(myIsClosed); } @@ -84,7 +77,7 @@ public class SvnAnnotationIsClosedTest extends SvnTestCase { checkin(); //#3 runInAndVerifyIgnoreOutput("up", "-r", "2"); - final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); + final VcsAnnotationLocalChangesListener listener = vcsManager.getAnnotationLocalChangesListener(); final FileAnnotation annotation = createTestAnnotation(vcs.getAnnotationProvider(), tree.myS1File); annotation.setCloser(() -> { myIsClosed = true; @@ -108,7 +101,7 @@ public class SvnAnnotationIsClosedTest extends SvnTestCase { checkin(); //#3 runInAndVerifyIgnoreOutput("up", "-r", "2"); // take #2 - final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); + final VcsAnnotationLocalChangesListener listener = vcsManager.getAnnotationLocalChangesListener(); final FileAnnotation annotation = createTestAnnotation(vcs.getAnnotationProvider(), tree.myS1File); annotation.setCloser(() -> { myIsClosed = true; @@ -134,7 +127,7 @@ public class SvnAnnotationIsClosedTest extends SvnTestCase { checkin(); //#3 runInAndVerifyIgnoreOutput("up", "-r", "2"); // take #2 - final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); + final VcsAnnotationLocalChangesListener listener = vcsManager.getAnnotationLocalChangesListener(); final FileAnnotation annotation = createTestAnnotation(vcs.getAnnotationProvider(), tree.myS1File); annotation.setCloser(() -> { myIsClosed = true; @@ -150,8 +143,8 @@ public class SvnAnnotationIsClosedTest extends SvnTestCase { myWorkingCopyDir.refresh(false, true); imitateEvent(myWorkingCopyDir); - myChangeListManager.ensureUpToDate(false); - myChangeListManager.ensureUpToDate(false); // wait for after-events like annotations recalculation + changeListManager.ensureUpToDate(false); + changeListManager.ensureUpToDate(false); // wait for after-events like annotations recalculation sleep(100); // zipper updater assertTrue(myIsClosed); } @@ -165,7 +158,7 @@ public class SvnAnnotationIsClosedTest extends SvnTestCase { VcsTestUtil.editFileInCommand(myProject, tree.myS1File, "1\n2\n3**\n4\n"); checkin(); - final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); + final VcsAnnotationLocalChangesListener listener = vcsManager.getAnnotationLocalChangesListener(); final FileAnnotation annotation = createTestAnnotation(vcs.getAnnotationProvider(), tree.myS1File); annotation.setCloser(() -> { myIsClosed = true; @@ -179,7 +172,7 @@ public class SvnAnnotationIsClosedTest extends SvnTestCase { assertFalse(myIsClosed); // not closed on typing refreshChanges(); - final Change change = myChangeListManager.getChange(tree.myS1File); + final Change change = changeListManager.getChange(tree.myS1File); assertNotNull(change); } @@ -193,7 +186,7 @@ public class SvnAnnotationIsClosedTest extends SvnTestCase { checkin(); VcsTestUtil.editFileInCommand(myProject, tree.myS1File, "1\n2\n3**\n4++\n"); - final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); + final VcsAnnotationLocalChangesListener listener = vcsManager.getAnnotationLocalChangesListener(); final FileAnnotation annotation = createTestAnnotation(vcs.getAnnotationProvider(), tree.myS1File); annotation.setCloser(() -> { myIsClosed = true; @@ -204,7 +197,7 @@ public class SvnAnnotationIsClosedTest extends SvnTestCase { assertFalse(myIsClosed); // not closed on typing refreshChanges(); - final Change change = myChangeListManager.getChange(tree.myS1File); + final Change change = changeListManager.getChange(tree.myS1File); assertNotNull(change); } @@ -217,7 +210,7 @@ public class SvnAnnotationIsClosedTest extends SvnTestCase { VcsTestUtil.editFileInCommand(myProject, tree.myS1File, "1\n2\n3**\n4\n"); checkin(); //#3 - final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); + final VcsAnnotationLocalChangesListener listener = vcsManager.getAnnotationLocalChangesListener(); final FileAnnotation annotation = createTestAnnotation(vcs.getAnnotationProvider(), tree.myS1File); annotation.setCloser(() -> { myIsClosed = true; @@ -233,8 +226,8 @@ public class SvnAnnotationIsClosedTest extends SvnTestCase { myWorkingCopyDir.refresh(false, true); imitateEvent(myWorkingCopyDir); - myChangeListManager.ensureUpToDate(false); - myChangeListManager.ensureUpToDate(false); // wait for after-events like annotations recalculation + changeListManager.ensureUpToDate(false); + changeListManager.ensureUpToDate(false); // wait for after-events like annotations recalculation sleep(100); // zipper updater assertTrue(myIsClosed); } @@ -258,8 +251,8 @@ public class SvnAnnotationIsClosedTest extends SvnTestCase { refreshChanges(); - final Change change1 = myChangeListManager.getChange(vf1); - final Change change2 = myChangeListManager.getChange(vf2); + final Change change1 = changeListManager.getChange(vf1); + final Change change2 = changeListManager.getChange(vf2); assertNotNull(change1); assertNotNull(change2); @@ -283,7 +276,7 @@ public class SvnAnnotationIsClosedTest extends SvnTestCase { assertRevision(vf2, diffProvider, 4); // then annotate both - final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); + final VcsAnnotationLocalChangesListener listener = vcsManager.getAnnotationLocalChangesListener(); final FileAnnotation annotation = createTestAnnotation(vcs.getAnnotationProvider(), vf1); annotation.setCloser(() -> { myIsClosed = true; @@ -302,8 +295,8 @@ public class SvnAnnotationIsClosedTest extends SvnTestCase { runInAndVerifyIgnoreOutput("up", sourceDir.getPath()); imitateEvent(lfs.refreshAndFindFileByIoFile(sourceDir)); imitateEvent(lfs.refreshAndFindFileByIoFile(externalDir)); - myChangeListManager.ensureUpToDate(false); - myChangeListManager.ensureUpToDate(false); // wait for after-events like annotations recalculation + changeListManager.ensureUpToDate(false); + changeListManager.ensureUpToDate(false); // wait for after-events like annotations recalculation sleep(100); // zipper updater //verify(runSvn("up", "-r", "3", externalDir.getPath())); assertRevision(vf1, diffProvider, 3); diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnChangesCorrectlyRefreshedTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnChangesCorrectlyRefreshedTest.java index 1d5ca90a48f4..1c4588919db7 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnChangesCorrectlyRefreshedTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnChangesCorrectlyRefreshedTest.java @@ -6,8 +6,6 @@ import com.intellij.openapi.vcs.VcsConfiguration; import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vcs.VcsTestUtil; 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.ui.RollbackWorker; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VfsUtil; @@ -26,14 +24,10 @@ import java.util.List; import static com.intellij.openapi.vfs.VfsUtilCore.virtualToIoFile; public class SvnChangesCorrectlyRefreshedTest extends SvnTestCase { - private ChangeListManager clManager; - @Override public void setUp() throws Exception { super.setUp(); - clManager = ChangeListManager.getInstance(myProject); - enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD); enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE); } @@ -52,7 +46,7 @@ public class SvnChangesCorrectlyRefreshedTest extends SvnTestCase { sleep(100); LocalFileSystem.getInstance().refreshAndFindFileByIoFile(virtualToIoFile(subTree.myS1File)); refreshChanges(); - final VcsException updateException = ((ChangeListManagerImpl)clManager).getUpdateException(); + final VcsException updateException = changeListManager.getUpdateException(); if (updateException != null) { updateException.printStackTrace(); } @@ -60,9 +54,10 @@ public class SvnChangesCorrectlyRefreshedTest extends SvnTestCase { Assert.assertNull(updateException == null ? null : updateException.getMessage(), updateException); } - DuringChangeListManagerUpdateTestScheme.checkFilesAreInList(new VirtualFile[] {subTree.myS1File}, clManager.getDefaultListName(), clManager); + DuringChangeListManagerUpdateTestScheme.checkFilesAreInList(new VirtualFile[]{subTree.myS1File}, changeListManager.getDefaultListName(), + changeListManager); - final Collection changes = clManager.getDefaultChangeList().getChanges(); + final Collection changes = changeListManager.getDefaultChangeList().getChanges(); final RollbackWorker worker = new RollbackWorker(myProject); worker.doRollback(changes, false); @@ -71,7 +66,8 @@ public class SvnChangesCorrectlyRefreshedTest extends SvnTestCase { Assert.assertEquals(SubTree.ourS1Contents, text.toString()); refreshChanges(); - DuringChangeListManagerUpdateTestScheme.checkFilesAreInList(VirtualFile.EMPTY_ARRAY, clManager.getDefaultListName(), clManager); + DuringChangeListManagerUpdateTestScheme.checkFilesAreInList(VirtualFile.EMPTY_ARRAY, changeListManager.getDefaultListName(), + changeListManager); } @Test @@ -87,17 +83,18 @@ public class SvnChangesCorrectlyRefreshedTest extends SvnTestCase { sleep(300); refreshChanges(); DuringChangeListManagerUpdateTestScheme - .checkFilesAreInList(new VirtualFile[]{subTree.myS1File}, clManager.getDefaultListName(), clManager); + .checkFilesAreInList(new VirtualFile[]{subTree.myS1File}, changeListManager.getDefaultListName(), changeListManager); - final Collection changes = clManager.getDefaultChangeList().getChanges(); + final Collection changes = changeListManager.getDefaultChangeList().getChanges(); final RollbackWorker worker = new RollbackWorker(myProject); worker.doRollback(changes, false); assertVF(subTree.mySourceDir, "s1.txt"); - clManager.ensureUpToDate(false); - DuringChangeListManagerUpdateTestScheme.checkFilesAreInList(VirtualFile.EMPTY_ARRAY, clManager.getDefaultListName(), clManager); + changeListManager.ensureUpToDate(false); + DuringChangeListManagerUpdateTestScheme.checkFilesAreInList(VirtualFile.EMPTY_ARRAY, changeListManager.getDefaultListName(), + changeListManager); } @Test @@ -111,17 +108,19 @@ public class SvnChangesCorrectlyRefreshedTest extends SvnTestCase { sleep(300); refreshChanges(); - DuringChangeListManagerUpdateTestScheme.checkFilesAreInList(new VirtualFile[] {subTree.myS1File}, clManager.getDefaultListName(), clManager); + DuringChangeListManagerUpdateTestScheme.checkFilesAreInList(new VirtualFile[]{subTree.myS1File}, changeListManager.getDefaultListName(), + changeListManager); - final Collection changes = clManager.getDefaultChangeList().getChanges(); + final Collection changes = changeListManager.getDefaultChangeList().getChanges(); final RollbackWorker worker = new RollbackWorker(myProject); worker.doRollback(changes, false); assertVF(subTree.mySourceDir, "s1.txt"); - clManager.ensureUpToDate(false); - DuringChangeListManagerUpdateTestScheme.checkFilesAreInList(VirtualFile.EMPTY_ARRAY, clManager.getDefaultListName(), clManager); + changeListManager.ensureUpToDate(false); + DuringChangeListManagerUpdateTestScheme.checkFilesAreInList(VirtualFile.EMPTY_ARRAY, changeListManager.getDefaultListName(), + changeListManager); } @Test @@ -139,9 +138,9 @@ public class SvnChangesCorrectlyRefreshedTest extends SvnTestCase { sleep(300); refreshChanges(); DuringChangeListManagerUpdateTestScheme.checkFilesAreInList(new VirtualFile[] {subTree.mySourceDir, subTree.myS1File, subTree.myS2File}, - clManager.getDefaultListName(), clManager); + changeListManager.getDefaultListName(), changeListManager); - final Collection changes = clManager.getDefaultChangeList().getChanges(); + final Collection changes = changeListManager.getDefaultChangeList().getChanges(); final RollbackWorker worker = new RollbackWorker(myProject); worker.doRollback(changes, false); @@ -151,8 +150,9 @@ public class SvnChangesCorrectlyRefreshedTest extends SvnTestCase { assertVF(subTree.mySourceDir, "s1.txt"); assertVF(subTree.mySourceDir, "s2.txt"); - clManager.ensureUpToDate(false); - DuringChangeListManagerUpdateTestScheme.checkFilesAreInList(VirtualFile.EMPTY_ARRAY, clManager.getDefaultListName(), clManager); + changeListManager.ensureUpToDate(false); + DuringChangeListManagerUpdateTestScheme.checkFilesAreInList(VirtualFile.EMPTY_ARRAY, changeListManager.getDefaultListName(), + changeListManager); } @Test @@ -171,9 +171,9 @@ public class SvnChangesCorrectlyRefreshedTest extends SvnTestCase { sleep(300); refreshChanges(); DuringChangeListManagerUpdateTestScheme.checkFilesAreInList(new VirtualFile[] {subTree.mySourceDir, subTree.myS1File, subTree.myS2File}, - clManager.getDefaultListName(), clManager); + changeListManager.getDefaultListName(), changeListManager); - final Collection changes = clManager.getDefaultChangeList().getChanges(); + final Collection changes = changeListManager.getDefaultChangeList().getChanges(); final RollbackWorker worker = new RollbackWorker(myProject); worker.doRollback(changes, false); @@ -186,8 +186,9 @@ public class SvnChangesCorrectlyRefreshedTest extends SvnTestCase { final CharSequence text = LoadTextUtil.loadText(subTree.myS1File); Assert.assertEquals(SubTree.ourS1Contents, text.toString()); - clManager.ensureUpToDate(false); - DuringChangeListManagerUpdateTestScheme.checkFilesAreInList(VirtualFile.EMPTY_ARRAY, clManager.getDefaultListName(), clManager); + changeListManager.ensureUpToDate(false); + DuringChangeListManagerUpdateTestScheme.checkFilesAreInList(VirtualFile.EMPTY_ARRAY, changeListManager.getDefaultListName(), + changeListManager); } @Test @@ -196,10 +197,11 @@ public class SvnChangesCorrectlyRefreshedTest extends SvnTestCase { refreshChanges(); final List files = getAllFiles(subTree); - - DuringChangeListManagerUpdateTestScheme.checkFilesAreInList(VfsUtil.toVirtualFileArray(files), clManager.getDefaultListName(), clManager); - final Collection changes = clManager.getDefaultChangeList().getChanges(); + DuringChangeListManagerUpdateTestScheme.checkFilesAreInList(VfsUtil.toVirtualFileArray(files), changeListManager.getDefaultListName(), + changeListManager); + + final Collection changes = changeListManager.getDefaultChangeList().getChanges(); final RollbackWorker worker = new RollbackWorker(myProject); worker.doRollback(changes, false); @@ -208,11 +210,12 @@ public class SvnChangesCorrectlyRefreshedTest extends SvnTestCase { assertVF(subTree.mySourceDir, "s1.txt"); assertVF(subTree.myRootDir, "target"); - clManager.ensureUpToDate(false); - DuringChangeListManagerUpdateTestScheme.checkFilesAreInList(VirtualFile.EMPTY_ARRAY, clManager.getDefaultListName(), clManager); + changeListManager.ensureUpToDate(false); + DuringChangeListManagerUpdateTestScheme.checkFilesAreInList(VirtualFile.EMPTY_ARRAY, changeListManager.getDefaultListName(), + changeListManager); for (VirtualFile file : files) { - Assert.assertTrue(file.getPath(), clManager.isUnversioned(file)); + Assert.assertTrue(file.getPath(), changeListManager.isUnversioned(file)); } } @@ -233,10 +236,11 @@ public class SvnChangesCorrectlyRefreshedTest extends SvnTestCase { refreshChanges(); final List files = getAllFiles(subTree); - DuringChangeListManagerUpdateTestScheme.checkDeletedFilesAreInList(VfsUtil.toVirtualFileArray(files), clManager.getDefaultListName(), - clManager); + DuringChangeListManagerUpdateTestScheme + .checkDeletedFilesAreInList(VfsUtil.toVirtualFileArray(files), changeListManager.getDefaultListName(), + changeListManager); - final Collection changes = clManager.getDefaultChangeList().getChanges(); + final Collection changes = changeListManager.getDefaultChangeList().getChanges(); final RollbackWorker worker = new RollbackWorker(myProject); worker.doRollback(changes, false); @@ -250,8 +254,9 @@ public class SvnChangesCorrectlyRefreshedTest extends SvnTestCase { assertVF(subTree.myTargetDir, "t14.txt"); assertVF(subTree.myTargetDir, "t15.txt"); - clManager.ensureUpToDate(false); - DuringChangeListManagerUpdateTestScheme.checkFilesAreInList(VirtualFile.EMPTY_ARRAY, clManager.getDefaultListName(), clManager); + changeListManager.ensureUpToDate(false); + DuringChangeListManagerUpdateTestScheme.checkFilesAreInList(VirtualFile.EMPTY_ARRAY, changeListManager.getDefaultListName(), + changeListManager); } @Nullable diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCommitTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCommitTest.java index bb2e2b2fd9bc..55955c3d6aab 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCommitTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCommitTest.java @@ -7,11 +7,9 @@ import com.intellij.openapi.vcs.FileStatus; import com.intellij.openapi.vcs.VcsConfiguration; import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vcs.changes.Change; -import com.intellij.openapi.vcs.changes.ChangeListManager; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.vcsUtil.VcsUtil; -import org.junit.Before; import org.junit.Test; import java.io.File; @@ -23,15 +21,6 @@ import java.util.List; import static org.junit.Assert.*; public class SvnCommitTest extends SvnTestCase { - private ChangeListManager myChangeListManager; - - @Override - @Before - public void setUp() throws Exception { - super.setUp(); - myChangeListManager = ChangeListManager.getInstance(myProject); - } - @Test public void testSimpleCommit() { enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD); @@ -182,7 +171,7 @@ public class SvnCommitTest extends SvnTestCase { private void checkinPaths(FilePath... files) { final List changes = new ArrayList<>(); for (FilePath file : files) { - final Change change = myChangeListManager.getChange(file); + final Change change = changeListManager.getChange(file); assertNotNull(change); changes.add(change); } @@ -191,7 +180,7 @@ public class SvnCommitTest extends SvnTestCase { refreshChanges(); for (FilePath file : files) { - final Change changeA = myChangeListManager.getChange(file); + final Change changeA = changeListManager.getChange(file); assertNull(changeA); } } @@ -199,7 +188,7 @@ public class SvnCommitTest extends SvnTestCase { private HashSet checkinFiles(VirtualFile... files) { final List changes = new ArrayList<>(); for (VirtualFile file : files) { - final Change change = myChangeListManager.getChange(file); + final Change change = changeListManager.getChange(file); assertNotNull(change); changes.add(change); } @@ -212,20 +201,20 @@ public class SvnCommitTest extends SvnTestCase { refreshChanges(); for (VirtualFile file : files) { - final Change changeA = myChangeListManager.getChange(file); + final Change changeA = changeListManager.getChange(file); assertNull(changeA); } return feedback; } protected void checkinFile(VirtualFile file, FileStatus status) { - final Change change = myChangeListManager.getChange(file); + final Change change = changeListManager.getChange(file); assertNotNull(change); assertEquals(status, change.getFileStatus()); final List exceptions = vcs.getCheckinEnvironment().commit(Collections.singletonList(change), "test comment"); assertTrue(exceptions == null || exceptions.isEmpty()); refreshChanges(); - final Change changeA = myChangeListManager.getChange(file); + final Change changeA = changeListManager.getChange(file); assertNull(changeA); } } diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnConcurrentChangeListManagerTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnConcurrentChangeListManagerTest.java index 167eade5e3d0..187c579270d5 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnConcurrentChangeListManagerTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnConcurrentChangeListManagerTest.java @@ -5,7 +5,6 @@ import com.intellij.openapi.vcs.FileStatus; import com.intellij.openapi.vcs.VcsConfiguration; import com.intellij.openapi.vcs.VcsTestUtil; 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.vfs.VirtualFile; import com.intellij.testFramework.vcs.DuringChangeListManagerUpdateTestScheme; @@ -32,7 +31,6 @@ public class SvnConcurrentChangeListManagerTest extends SvnTestCase { public void testRenameList() { enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD); final VirtualFile file = createFileInCommand("a.txt", "old content"); - final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject); changeListManager.ensureUpToDate(false); final LocalChangeList list = changeListManager.addChangeList("test", null); @@ -42,13 +40,13 @@ public class SvnConcurrentChangeListManagerTest extends SvnTestCase { myScheme.doTest(() -> { changeListManager.editName(list.getName(), newName); - checkFilesAreInList(new VirtualFile[] {file}, newName, changeListManager); + checkFilesAreInList(new VirtualFile[]{file}, newName); }); - checkFilesAreInList(new VirtualFile[] {file}, newName, changeListManager); + checkFilesAreInList(new VirtualFile[]{file}, newName); changeListManager.ensureUpToDate(false); - checkFilesAreInList(new VirtualFile[] {file}, newName, changeListManager); + checkFilesAreInList(new VirtualFile[]{file}, newName); } @Test @@ -60,7 +58,6 @@ public class SvnConcurrentChangeListManagerTest extends SvnTestCase { runInAndVerifyIgnoreOutput("switch", branchUrl + "/root/source/s1.txt", tree.myS1File.getPath()); runInAndVerifyIgnoreOutput("switch", branchUrl + "/root/target", tree.myTargetDir.getPath()); - final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject); refreshChanges(); final Runnable check = () -> { @@ -97,7 +94,6 @@ public class SvnConcurrentChangeListManagerTest extends SvnTestCase { public void testEditComment() { enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD); final VirtualFile file = createFileInCommand("a.txt", "old content"); - final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject); changeListManager.ensureUpToDate(false); final String listName = "test"; @@ -130,7 +126,7 @@ public class SvnConcurrentChangeListManagerTest extends SvnTestCase { public void testMove() { enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD); final VirtualFile file = createFileInCommand("a.txt", "old content"); - final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject); + changeListManager.ensureUpToDate(false); final LocalChangeList list = changeListManager.addChangeList("test", null); @@ -139,20 +135,20 @@ public class SvnConcurrentChangeListManagerTest extends SvnTestCase { myScheme.doTest(() -> { changeListManager.moveChangesTo(target, new Change[] {changeListManager.getChange(file)}); - checkFilesAreInList(new VirtualFile[] {file}, target.getName(), changeListManager); + checkFilesAreInList(new VirtualFile[]{file}, target.getName()); }); - checkFilesAreInList(new VirtualFile[] {file}, target.getName(), changeListManager); + checkFilesAreInList(new VirtualFile[]{file}, target.getName()); changeListManager.ensureUpToDate(false); - checkFilesAreInList(new VirtualFile[] {file}, target.getName(), changeListManager); + checkFilesAreInList(new VirtualFile[]{file}, target.getName()); } @Test public void testSetActive() { enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD); final VirtualFile file = createFileInCommand("a.txt", "old content"); - final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject); + changeListManager.ensureUpToDate(false); final LocalChangeList list = changeListManager.addChangeList("test", null); @@ -175,7 +171,7 @@ public class SvnConcurrentChangeListManagerTest extends SvnTestCase { enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD); final VirtualFile file = createFileInCommand("a.txt", "old content"); final VirtualFile fileB = createFileInCommand("b.txt", "old content"); - final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject); + changeListManager.ensureUpToDate(false); final LocalChangeList list = changeListManager.addChangeList("test", null); @@ -184,22 +180,22 @@ public class SvnConcurrentChangeListManagerTest extends SvnTestCase { myScheme.doTest(() -> { changeListManager.removeChangeList(list.getName()); assert changeListManager.findChangeList(list.getName()) == null; - checkFilesAreInList(new VirtualFile[] {file, fileB}, myDefaulListName, changeListManager); + checkFilesAreInList(new VirtualFile[]{file, fileB}, myDefaulListName); }); assert changeListManager.findChangeList(list.getName()) == null; - checkFilesAreInList(new VirtualFile[] {file, fileB}, myDefaulListName, changeListManager); + checkFilesAreInList(new VirtualFile[]{file, fileB}, myDefaulListName); changeListManager.ensureUpToDate(false); assert changeListManager.findChangeList(list.getName()) == null; - checkFilesAreInList(new VirtualFile[] {file, fileB}, myDefaulListName, changeListManager); + checkFilesAreInList(new VirtualFile[]{file, fileB}, myDefaulListName); } @Test public void testDoubleMove() { enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD); final VirtualFile file = createFileInCommand("a.txt", "old content"); - final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject); + changeListManager.ensureUpToDate(false); final LocalChangeList list = changeListManager.addChangeList("test", null); @@ -209,22 +205,22 @@ public class SvnConcurrentChangeListManagerTest extends SvnTestCase { myScheme.doTest(() -> { changeListManager.moveChangesTo(target, new Change[] {changeListManager.getChange(file)}); - checkFilesAreInList(new VirtualFile[] {file}, target.getName(), changeListManager); + checkFilesAreInList(new VirtualFile[]{file}, target.getName()); changeListManager.moveChangesTo(target2, new Change[] {changeListManager.getChange(file)}); - checkFilesAreInList(new VirtualFile[] {file}, target2.getName(), changeListManager); + checkFilesAreInList(new VirtualFile[]{file}, target2.getName()); }); - checkFilesAreInList(new VirtualFile[] {file}, target2.getName(), changeListManager); + checkFilesAreInList(new VirtualFile[]{file}, target2.getName()); changeListManager.ensureUpToDate(false); - checkFilesAreInList(new VirtualFile[] {file}, target2.getName(), changeListManager); + checkFilesAreInList(new VirtualFile[]{file}, target2.getName()); } @Test public void testDoubleMoveBack() { enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD); final VirtualFile file = createFileInCommand("a.txt", "old content"); - final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject); + changeListManager.ensureUpToDate(false); final LocalChangeList list = changeListManager.addChangeList("test", null); @@ -233,22 +229,22 @@ public class SvnConcurrentChangeListManagerTest extends SvnTestCase { myScheme.doTest(() -> { changeListManager.moveChangesTo(target, new Change[] {changeListManager.getChange(file)}); - checkFilesAreInList(new VirtualFile[] {file}, target.getName(), changeListManager); + checkFilesAreInList(new VirtualFile[]{file}, target.getName()); changeListManager.moveChangesTo(list, new Change[] {changeListManager.getChange(file)}); - checkFilesAreInList(new VirtualFile[] {file}, list.getName(), changeListManager); + checkFilesAreInList(new VirtualFile[]{file}, list.getName()); }); - checkFilesAreInList(new VirtualFile[] {file}, list.getName(), changeListManager); + checkFilesAreInList(new VirtualFile[]{file}, list.getName()); changeListManager.ensureUpToDate(false); - checkFilesAreInList(new VirtualFile[] {file}, list.getName(), changeListManager); + checkFilesAreInList(new VirtualFile[]{file}, list.getName()); } @Test public void testAddPlusMove() { enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD); final VirtualFile file = createFileInCommand("a.txt", "old content"); - final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject); + changeListManager.ensureUpToDate(false); final LocalChangeList list = changeListManager.addChangeList("test", null); @@ -259,27 +255,27 @@ public class SvnConcurrentChangeListManagerTest extends SvnTestCase { myScheme.doTest(() -> { final LocalChangeList target = changeListManager.addChangeList(targetName, null); changeListManager.moveChangesTo(target, new Change[] {changeListManager.getChange(file)}); - checkFilesAreInList(new VirtualFile[] {file}, targetName, changeListManager); + checkFilesAreInList(new VirtualFile[]{file}, targetName); }); - checkFilesAreInList(new VirtualFile[] {file}, targetName, changeListManager); + checkFilesAreInList(new VirtualFile[]{file}, targetName); changeListManager.ensureUpToDate(false); - checkFilesAreInList(new VirtualFile[] {file}, targetName, changeListManager); + checkFilesAreInList(new VirtualFile[]{file}, targetName); } @Test public void testAddListBySvn() throws Exception { enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD); final VirtualFile file = createFileInCommand("a.txt", "old content"); - final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject); + final String targetName = "target"; // not parralel, just test of correct detection runInAndVerifyIgnoreOutput("changelist", targetName, file.getPath()); refreshChanges(); - checkFilesAreInList(new VirtualFile[]{file}, targetName, changeListManager); + checkFilesAreInList(new VirtualFile[]{file}, targetName); } @Test @@ -290,7 +286,6 @@ public class SvnConcurrentChangeListManagerTest extends SvnTestCase { final VirtualFile fileC = createFileInCommand("c.txt", "old content"); final VirtualFile fileD = createFileInCommand("d.txt", "old content"); - final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject); final LocalChangeList list = changeListManager.addChangeList("test", null); final LocalChangeList toBeDeletedList = changeListManager.addChangeList("toBeDeletedList", null); @@ -304,29 +299,29 @@ public class SvnConcurrentChangeListManagerTest extends SvnTestCase { myScheme.doTest(() -> { final LocalChangeList target = changeListManager.addChangeList(targetName, null); changeListManager.moveChangesTo(target, new Change[] {changeListManager.getChange(file), changeListManager.getChange(fileB)}); - checkFilesAreInList(new VirtualFile[] {file, fileB}, targetName, changeListManager); + checkFilesAreInList(new VirtualFile[]{file, fileB}, targetName); changeListManager.editName(targetName, finalName); - checkFilesAreInList(new VirtualFile[] {file, fileB}, finalName, changeListManager); + checkFilesAreInList(new VirtualFile[]{file, fileB}, finalName); changeListManager.removeChangeList(toBeDeletedList.getName()); - checkFilesAreInList(new VirtualFile[] {fileC, fileD}, myDefaulListName, changeListManager); + checkFilesAreInList(new VirtualFile[]{fileC, fileD}, myDefaulListName); changeListManager.moveChangesTo(LocalChangeList.createEmptyChangeList(myProject, finalName), new Change[] {changeListManager.getChange(fileC)}); - checkFilesAreInList(new VirtualFile[] {file, fileB, fileC}, finalName, changeListManager); - checkFilesAreInList(new VirtualFile[] {fileD}, myDefaulListName, changeListManager); + checkFilesAreInList(new VirtualFile[]{file, fileB, fileC}, finalName); + checkFilesAreInList(new VirtualFile[]{fileD}, myDefaulListName); }); - checkFilesAreInList(new VirtualFile[] {file, fileB, fileC}, finalName, changeListManager); - checkFilesAreInList(new VirtualFile[] {fileD}, myDefaulListName, changeListManager); + checkFilesAreInList(new VirtualFile[]{file, fileB, fileC}, finalName); + checkFilesAreInList(new VirtualFile[]{fileD}, myDefaulListName); changeListManager.ensureUpToDate(false); - checkFilesAreInList(new VirtualFile[] {file, fileB, fileC}, finalName, changeListManager); - checkFilesAreInList(new VirtualFile[] {fileD}, myDefaulListName, changeListManager); + checkFilesAreInList(new VirtualFile[]{file, fileB, fileC}, finalName); + checkFilesAreInList(new VirtualFile[]{fileD}, myDefaulListName); } - private void checkFilesAreInList(final VirtualFile[] files, final String listName, final ChangeListManager manager) { + private void checkFilesAreInList(final VirtualFile[] files, final String listName) { System.out.println("Checking files for list: " + listName); - assertNotNull(manager.findChangeList(listName)); - final Collection changes = manager.findChangeList(listName).getChanges(); + assertNotNull(changeListManager.findChangeList(listName)); + final Collection changes = changeListManager.findChangeList(listName).getChanges(); assertEquals(changes.size(), files.length); for (Change change : changes) { diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnDeleteTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnDeleteTest.java index e4d1ff150f62..b21ebe9e845a 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnDeleteTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnDeleteTest.java @@ -3,7 +3,6 @@ package org.jetbrains.idea.svn; 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.LocalChangeList; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.vcsUtil.VcsUtil; @@ -43,8 +42,7 @@ public class SvnDeleteTest extends SvnTestCase { Assert.assertEquals(2, changesManually.size()); refreshChanges(); - final ChangeListManager clManager = ChangeListManager.getInstance(myProject); - final List lists = clManager.getChangeListsCopy(); + final List lists = changeListManager.getChangeListsCopy(); Assert.assertEquals(1, lists.size()); final Collection changes = lists.get(0).getChanges(); Assert.assertEquals(2, changes.size()); diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnExternalCommitNoticedTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnExternalCommitNoticedTest.java index 253fe5fb7085..4bda6ef6f35a 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnExternalCommitNoticedTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnExternalCommitNoticedTest.java @@ -4,8 +4,6 @@ package org.jetbrains.idea.svn; import com.intellij.openapi.vcs.FileStatus; import com.intellij.openapi.vcs.VcsConfiguration; import com.intellij.openapi.vcs.VcsTestUtil; -import com.intellij.openapi.vcs.changes.ChangeListManager; -import com.intellij.openapi.vcs.changes.ChangeListManagerImpl; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.TimeoutUtil; @@ -19,16 +17,12 @@ import java.util.List; import static org.jetbrains.idea.svn.SvnUtil.parseUrl; public class SvnExternalCommitNoticedTest extends SvnTestCase { - private ChangeListManagerImpl clManager; - @Override @Before public void setUp() throws Exception { //System.setProperty(FileWatcher.PROPERTY_WATCHER_DISABLED, "false"); super.setUp(); - clManager = (ChangeListManagerImpl) ChangeListManager.getInstance(myProject); - enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD); enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE); } @@ -43,7 +37,7 @@ public class SvnExternalCommitNoticedTest extends SvnTestCase { VcsTestUtil.editFileInCommand(myProject, tree.myTargetFiles.get(1), "target1"); refreshChanges(); - Assert.assertEquals(3, clManager.getChangesIn(myWorkingCopyDir).size()); + Assert.assertEquals(3, changeListManager.getChangesIn(myWorkingCopyDir).size()); TimeoutUtil.sleep(100); @@ -52,8 +46,8 @@ public class SvnExternalCommitNoticedTest extends SvnTestCase { myWorkingCopyDir.refresh(false, true); imitateEvent(myWorkingCopyDir); // no dirty scope externally provided! just VFS refresh - clManager.ensureUpToDate(false); - Assert.assertEquals(0, clManager.getChangesIn(myWorkingCopyDir).size()); + changeListManager.ensureUpToDate(false); + Assert.assertEquals(0, changeListManager.getChangesIn(myWorkingCopyDir).size()); } @Test @@ -64,7 +58,7 @@ public class SvnExternalCommitNoticedTest extends SvnTestCase { VcsTestUtil.renameFileInCommand(myProject, tree.myTargetDir, "aabbcc"); refreshChanges(); - Assert.assertEquals(11, clManager.getChangesIn(myWorkingCopyDir).size()); + Assert.assertEquals(11, changeListManager.getChangesIn(myWorkingCopyDir).size()); TimeoutUtil.sleep(100); @@ -73,8 +67,8 @@ public class SvnExternalCommitNoticedTest extends SvnTestCase { myWorkingCopyDir.refresh(false, true); imitateEvent(myWorkingCopyDir); // no dirty scope externally provided! just VFS refresh - clManager.ensureUpToDate(false); - Assert.assertEquals(0, clManager.getChangesIn(myWorkingCopyDir).size()); + changeListManager.ensureUpToDate(false); + Assert.assertEquals(0, changeListManager.getChangesIn(myWorkingCopyDir).size()); } @Test @@ -89,13 +83,13 @@ public class SvnExternalCommitNoticedTest extends SvnTestCase { myWorkingCopyDir.refresh(false, true); imitateEvent(myWorkingCopyDir); // no dirty scope externally provided! just VFS refresh - clManager.ensureUpToDate(false); + changeListManager.ensureUpToDate(false); - Assert.assertEquals(FileStatus.SWITCHED, clManager.getStatus(tree.myS1File)); - Assert.assertEquals(FileStatus.NOT_CHANGED, clManager.getStatus(tree.myS2File)); - Assert.assertEquals(FileStatus.NOT_CHANGED, clManager.getStatus(tree.mySourceDir)); - Assert.assertEquals(FileStatus.SWITCHED, clManager.getStatus(tree.myTargetDir)); - Assert.assertEquals(FileStatus.SWITCHED, clManager.getStatus(tree.myTargetFiles.get(1))); + Assert.assertEquals(FileStatus.SWITCHED, changeListManager.getStatus(tree.myS1File)); + Assert.assertEquals(FileStatus.NOT_CHANGED, changeListManager.getStatus(tree.myS2File)); + Assert.assertEquals(FileStatus.NOT_CHANGED, changeListManager.getStatus(tree.mySourceDir)); + Assert.assertEquals(FileStatus.SWITCHED, changeListManager.getStatus(tree.myTargetDir)); + Assert.assertEquals(FileStatus.SWITCHED, changeListManager.getStatus(tree.myTargetFiles.get(1))); } @Test @@ -104,8 +98,8 @@ public class SvnExternalCommitNoticedTest extends SvnTestCase { final SubTree tree = new SubTree(myWorkingCopyDir); vcs.invokeRefreshSvnRoots(); - clManager.ensureUpToDate(false); - clManager.ensureUpToDate(false); + changeListManager.ensureUpToDate(false); + changeListManager.ensureUpToDate(false); SvnFileUrlMapping workingCopies = vcs.getSvnFileUrlMapping(); List infos = workingCopies.getAllWcInfos(); Assert.assertEquals(1, infos.size()); @@ -117,8 +111,8 @@ public class SvnExternalCommitNoticedTest extends SvnTestCase { imitateEvent(myWorkingCopyDir); sleep(300); // no dirty scope externally provided! just VFS refresh - clManager.ensureUpToDate(false); - clManager.ensureUpToDate(false); //first run queries one more update + changeListManager.ensureUpToDate(false); + changeListManager.ensureUpToDate(false); //first run queries one more update workingCopies = vcs.getSvnFileUrlMapping(); infos = workingCopies.getAllWcInfos(); @@ -142,7 +136,7 @@ public class SvnExternalCommitNoticedTest extends SvnTestCase { renameFileInCommand(vfMain, "ss11.txt"); refreshChanges(); - Assert.assertEquals(2, clManager.getChangesIn(myWorkingCopyDir).size()); + Assert.assertEquals(2, changeListManager.getChangesIn(myWorkingCopyDir).size()); TimeoutUtil.sleep(100); @@ -154,7 +148,7 @@ public class SvnExternalCommitNoticedTest extends SvnTestCase { imitateEvent(lfs.refreshAndFindFileByIoFile(sourceDir)); imitateEvent(lfs.refreshAndFindFileByIoFile(externalDir)); // no dirty scope externally provided! just VFS refresh - clManager.ensureUpToDate(false); - Assert.assertEquals(0, clManager.getChangesIn(myWorkingCopyDir).size()); + changeListManager.ensureUpToDate(false); + Assert.assertEquals(0, changeListManager.getChangesIn(myWorkingCopyDir).size()); } } diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnExternalTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnExternalTest.java index 9e6d6e8baaca..4d4a44fee859 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnExternalTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnExternalTest.java @@ -2,10 +2,11 @@ package org.jetbrains.idea.svn; import com.intellij.openapi.util.io.FileUtil; -import com.intellij.openapi.vcs.*; +import com.intellij.openapi.vcs.FileStatus; +import com.intellij.openapi.vcs.VcsConfiguration; +import com.intellij.openapi.vcs.VcsDirectoryMapping; +import com.intellij.openapi.vcs.VcsTestUtil; 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.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.ui.UIUtil; @@ -22,7 +23,6 @@ import static org.jetbrains.idea.svn.SvnUtil.parseUrl; import static org.junit.Assert.*; public class SvnExternalTest extends SvnTestCase { - private ChangeListManagerImpl clManager; private Url myMainUrl; private Url myExternalURL; @@ -30,8 +30,6 @@ public class SvnExternalTest extends SvnTestCase { public void setUp() throws Exception { super.setUp(); - clManager = (ChangeListManagerImpl) ChangeListManager.getInstance(myProject); - enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD); enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE); myMainUrl = parseUrl(myRepoUrl + "/root/source", false); @@ -120,8 +118,8 @@ public class SvnExternalTest extends SvnTestCase { refreshChanges(); - final Change change1 = clManager.getChange(vf1); - final Change change2 = clManager.getChange(vf2); + final Change change1 = changeListManager.getChange(vf1); + final Change change2 = changeListManager.getChange(vf2); assertNotNull(change1); assertNotNull(change2); @@ -156,7 +154,7 @@ public class SvnExternalTest extends SvnTestCase { } private void setNewDirectoryMappings(final File sourceDir) { - UIUtil.invokeAndWaitIfNeeded((Runnable)() -> ProjectLevelVcsManager.getInstance(myProject).setDirectoryMappings( + UIUtil.invokeAndWaitIfNeeded((Runnable)() -> vcsManager.setDirectoryMappings( Arrays.asList(new VcsDirectoryMapping(FileUtil.toSystemIndependentName(sourceDir.getPath()), vcs.getName())))); } @@ -181,7 +179,7 @@ public class SvnExternalTest extends SvnTestCase { refreshChanges(); - final Change change = clManager.getChange(externalVf); + final Change change = changeListManager.getChange(externalVf); assertNotNull(change); assertEquals(FileStatus.MODIFIED, change.getFileStatus()); } diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnIgnoreTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnIgnoreTest.java index afa46931105c..58558596588b 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnIgnoreTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnIgnoreTest.java @@ -3,8 +3,6 @@ package org.jetbrains.idea.svn; import com.intellij.openapi.vcs.FileStatus; import com.intellij.openapi.vcs.VcsConfiguration; -import com.intellij.openapi.vcs.changes.ChangeListManager; -import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.idea.svn.api.Depth; import org.jetbrains.idea.svn.properties.PropertyValue; @@ -20,14 +18,10 @@ import static com.intellij.openapi.vfs.VfsUtilCore.virtualToIoFile; import static org.jetbrains.idea.svn.SvnPropertyKeys.SVN_IGNORE; public class SvnIgnoreTest extends SvnTestCase { - private ChangeListManager clManager; - @Override public void setUp() throws Exception { super.setUp(); - clManager = ChangeListManager.getInstance(myProject); - enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD); enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE); } @@ -49,7 +43,7 @@ public class SvnIgnoreTest extends SvnTestCase { current = createDirInCommand(current, "dir" + i); ignored.add(current); refreshChanges(); - Assert.assertTrue(clManager.getDefaultChangeList().getChanges().isEmpty()); + Assert.assertTrue(changeListManager.getDefaultChangeList().getChanges().isEmpty()); } testOneFile(current, "file.txt"); @@ -106,13 +100,13 @@ public class SvnIgnoreTest extends SvnTestCase { private void testImpl(VirtualFile file) { refreshChanges(); - Assert.assertTrue(clManager.getDefaultChangeList().getChanges().isEmpty()); + Assert.assertTrue(changeListManager.getDefaultChangeList().getChanges().isEmpty()); - VcsDirtyScopeManager.getInstance(myProject).fileDirty(file); - clManager.ensureUpToDate(false); + dirtyScopeManager.fileDirty(file); + changeListManager.ensureUpToDate(false); - Assert.assertTrue(clManager.getDefaultChangeList().getChanges().isEmpty()); - final FileStatus status = clManager.getStatus(file); + Assert.assertTrue(changeListManager.getDefaultChangeList().getChanges().isEmpty()); + final FileStatus status = changeListManager.getStatus(file); Assert.assertTrue(status.getText(), FileStatus.IGNORED.equals(status)); } } diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnMergeInfoTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnMergeInfoTest.java index 568d2bea5e8d..92a4b1dd348b 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnMergeInfoTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnMergeInfoTest.java @@ -2,8 +2,10 @@ package org.jetbrains.idea.svn; import com.intellij.openapi.util.io.FileUtil; -import com.intellij.openapi.vcs.*; -import com.intellij.openapi.vcs.impl.ProjectLevelVcsManagerImpl; +import com.intellij.openapi.vcs.CommittedChangesProvider; +import com.intellij.openapi.vcs.VcsConfiguration; +import com.intellij.openapi.vcs.VcsException; +import com.intellij.openapi.vcs.VcsTestUtil; import com.intellij.openapi.vcs.versionBrowser.ChangeBrowserSettings; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; @@ -43,7 +45,6 @@ public class SvnMergeInfoTest extends SvnTestCase { private static final String CONTENT2 = "123\n456\n123\n4"; private File myBranchVcsRoot; - private ProjectLevelVcsManagerImpl myProjectLevelVcsManager; private WCInfo myWCInfo; private WCInfoWithBranches myWCInfoWithBranches; private OneShotMergeInfoHelper myOneShotMergeInfoHelper; @@ -70,8 +71,7 @@ public class SvnMergeInfoTest extends SvnTestCase { myBranchVcsRoot = new File(myTempDirFixture.getTempDirPath(), "branch"); myBranchVcsRoot.mkdir(); - myProjectLevelVcsManager = (ProjectLevelVcsManagerImpl) ProjectLevelVcsManager.getInstance(myProject); - myProjectLevelVcsManager.setDirectoryMapping(myBranchVcsRoot.getAbsolutePath(), SvnVcs.VCS_NAME); + vcsManager.setDirectoryMapping(myBranchVcsRoot.getAbsolutePath(), SvnVcs.VCS_NAME); VirtualFile vcsRoot = LocalFileSystem.getInstance().findFileByIoFile(myBranchVcsRoot); Node node = new Node(vcsRoot, createUrl(myBranchUrl), createUrl(myRepoUrl)); diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnNativeClientAuthTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnNativeClientAuthTest.java index 9aa60b1268c2..d63e2fcef304 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnNativeClientAuthTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnNativeClientAuthTest.java @@ -4,7 +4,10 @@ package org.jetbrains.idea.svn; import com.intellij.openapi.progress.EmptyProgressIndicator; import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.io.FileUtil; -import com.intellij.openapi.vcs.*; +import com.intellij.openapi.vcs.CheckoutProvider; +import com.intellij.openapi.vcs.FilePath; +import com.intellij.openapi.vcs.VcsException; +import com.intellij.openapi.vcs.VcsKey; import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vcs.changes.CurrentContentRevision; import com.intellij.openapi.vcs.update.UpdateSession; @@ -517,7 +520,7 @@ public class SvnNativeClientAuthTest extends SvnTestCase { ++ myExpectedCreds; ++ myExpectedCert; } - ProjectLevelVcsManager.getInstance(myProject).setDirectoryMapping(root.getPath(), SvnVcs.VCS_NAME); + vcsManager.setDirectoryMapping(root.getPath(), SvnVcs.VCS_NAME); refreshSvnMappingsSynchronously(); return root; } diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnNativeListsTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnNativeListsTest.java index 73e54629e694..ca747d879df0 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnNativeListsTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnNativeListsTest.java @@ -5,7 +5,6 @@ import com.intellij.openapi.vcs.VcsConfiguration; import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vcs.VcsTestUtil; import com.intellij.openapi.vcs.changes.Change; -import com.intellij.openapi.vcs.changes.ChangeListManager; import com.intellij.openapi.vcs.changes.ContentRevision; import com.intellij.openapi.vcs.changes.LocalChangeList; import com.intellij.openapi.vfs.VirtualFile; @@ -16,17 +15,9 @@ import java.util.Collection; import java.util.List; public class SvnNativeListsTest extends SvnTestCase { - private ChangeListManager myChangeListManager; - - @Override - public void setUp() throws Exception { - super.setUp(); - myChangeListManager = ChangeListManager.getInstance(myProject); - } - @Override public void tearDown() throws Exception { - final List changeListList = myChangeListManager.getChangeLists(); + final List changeListList = changeListManager.getChangeLists(); for (LocalChangeList list : changeListList) { if (list.hasDefaultName()) continue; final Collection changes = list.getChanges(); @@ -46,11 +37,11 @@ public class SvnNativeListsTest extends SvnTestCase { @Test public void testAdd() throws Throwable { - final LocalChangeList newL = myChangeListManager.addChangeList("newOne", null); + final LocalChangeList newL = changeListManager.addChangeList("newOne", null); sleepABit(); refreshChanges(); - myChangeListManager.setDefaultChangeList(newL); + changeListManager.setDefaultChangeList(newL); enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD); final VirtualFile file = createFileInCommand("a.txt", "old content"); @@ -64,17 +55,17 @@ public class SvnNativeListsTest extends SvnTestCase { private void ensureAddedToNativeList() { refreshChanges(); // first time new changes are detected and added to _IDEA_ changeslist - myChangeListManager.ensureUpToDate(false); // and on the same thread a request is put for files addition; + changeListManager.ensureUpToDate(false); // and on the same thread a request is put for files addition; // so stay here for 2nd cycle and wait for native addition completion } @Test public void testDeleted() throws Throwable { - final LocalChangeList newL = myChangeListManager.addChangeList("newOne", null); + final LocalChangeList newL = changeListManager.addChangeList("newOne", null); sleepABit(); refreshChanges(); - myChangeListManager.setDefaultChangeList(newL); + changeListManager.setDefaultChangeList(newL); enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD); enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE); @@ -92,11 +83,11 @@ public class SvnNativeListsTest extends SvnTestCase { @Test public void testEdit() throws Throwable { - final LocalChangeList newL = myChangeListManager.addChangeList("newOne", null); + final LocalChangeList newL = changeListManager.addChangeList("newOne", null); sleepABit(); refreshChanges(); - myChangeListManager.setDefaultChangeList(newL); + changeListManager.setDefaultChangeList(newL); enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD); final VirtualFile file = createFileInCommand("a.txt", "old content"); @@ -113,11 +104,11 @@ public class SvnNativeListsTest extends SvnTestCase { @Test public void testEditAndMove() throws Throwable { - final LocalChangeList newL = myChangeListManager.addChangeList("newOne", null); + final LocalChangeList newL = changeListManager.addChangeList("newOne", null); sleepABit(); refreshChanges(); - myChangeListManager.setDefaultChangeList(newL); + changeListManager.setDefaultChangeList(newL); enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD); enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE); @@ -144,11 +135,11 @@ public class SvnNativeListsTest extends SvnTestCase { @Test public void testMove() throws Throwable { - final LocalChangeList newL = myChangeListManager.addChangeList("newOne", null); + final LocalChangeList newL = changeListManager.addChangeList("newOne", null); sleepABit(); refreshChanges(); - myChangeListManager.setDefaultChangeList(newL); + changeListManager.setDefaultChangeList(newL); enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD); enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE); @@ -167,11 +158,11 @@ public class SvnNativeListsTest extends SvnTestCase { @Test public void testMoveMove() throws Throwable { - final LocalChangeList newL = myChangeListManager.addChangeList("newOne", null); + final LocalChangeList newL = changeListManager.addChangeList("newOne", null); sleepABit(); refreshChanges(); - myChangeListManager.setDefaultChangeList(newL); + changeListManager.setDefaultChangeList(newL); enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD); enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE); diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnQuickMergeTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnQuickMergeTest.java index d7bf41ec61fb..4e68f62f172d 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnQuickMergeTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnQuickMergeTest.java @@ -5,7 +5,6 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vcs.FileStatus; import com.intellij.openapi.vcs.VcsTestUtil; import com.intellij.openapi.vcs.changes.Change; -import com.intellij.openapi.vcs.changes.ChangeListManager; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.SmartList; @@ -44,7 +43,6 @@ public class SvnQuickMergeTest extends SvnTestCase { private File myBranchRoot; private VirtualFile myBranchVf; private SubTree myBranchTree; - private ChangeListManager myChangeListManager; private SvnTestCase.SubTree myTree; @Override @@ -52,7 +50,6 @@ public class SvnQuickMergeTest extends SvnTestCase { public void setUp() throws Exception { super.setUp(); - myChangeListManager = ChangeListManager.getInstance(myProject); myBranchUrl = prepareBranchesStructure(); myBranchRoot = new File(myTempDirFixture.getTempDirPath(), "b1"); @@ -87,11 +84,11 @@ public class SvnQuickMergeTest extends SvnTestCase { refreshChanges(); // should have changed svn:mergeinfo on wc root and s1 file - final Change fileChange = myChangeListManager.getChange(myTree.myS1File); + final Change fileChange = changeListManager.getChange(myTree.myS1File); assertNotNull(fileChange); assertEquals(FileStatus.MODIFIED, fileChange.getFileStatus()); - final Change dirChange = myChangeListManager.getChange(myWorkingCopyDir); + final Change dirChange = changeListManager.getChange(myWorkingCopyDir); assertNotNull(dirChange); assertEquals(FileStatus.MODIFIED, dirChange.getFileStatus()); } @@ -144,11 +141,11 @@ public class SvnQuickMergeTest extends SvnTestCase { refreshChanges(); // should have changed svn:mergeinfo on wc root and s1 file - final Change fileChange = myChangeListManager.getChange(myTree.myS1File); + final Change fileChange = changeListManager.getChange(myTree.myS1File); assertNotNull(fileChange); assertEquals(FileStatus.MODIFIED, fileChange.getFileStatus()); - final Change dirChange = myChangeListManager.getChange(myWorkingCopyDir); + final Change dirChange = changeListManager.getChange(myWorkingCopyDir); assertNotNull(dirChange); assertEquals(FileStatus.MODIFIED, dirChange.getFileStatus()); @@ -209,11 +206,11 @@ public class SvnQuickMergeTest extends SvnTestCase { refreshChanges(); // should have changed svn:mergeinfo on wc root and s1 file - final Change fileChange = myChangeListManager.getChange(myTree.myS2File); + final Change fileChange = changeListManager.getChange(myTree.myS2File); assertNotNull(fileChange); assertEquals(FileStatus.MODIFIED, fileChange.getFileStatus()); - final Change dirChange = myChangeListManager.getChange(myWorkingCopyDir); + final Change dirChange = changeListManager.getChange(myWorkingCopyDir); assertNotNull(dirChange); assertEquals(FileStatus.MODIFIED, dirChange.getFileStatus()); @@ -248,11 +245,11 @@ public class SvnQuickMergeTest extends SvnTestCase { refreshChanges(); // should have changed svn:mergeinfo on wc root and s1 file - final Change fileChange = myChangeListManager.getChange(myTree.myS1File); + final Change fileChange = changeListManager.getChange(myTree.myS1File); assertNotNull(fileChange); assertEquals(FileStatus.MODIFIED, fileChange.getFileStatus()); - final Change dirChange = myChangeListManager.getChange(myWorkingCopyDir); + final Change dirChange = changeListManager.getChange(myWorkingCopyDir); assertNotNull(dirChange); assertEquals(FileStatus.MODIFIED, dirChange.getFileStatus()); @@ -295,11 +292,11 @@ public class SvnQuickMergeTest extends SvnTestCase { refreshChanges(); // should have changed svn:mergeinfo on wc root and s1 file - final Change fileChange = myChangeListManager.getChange(myTree.myS1File); + final Change fileChange = changeListManager.getChange(myTree.myS1File); assertNotNull(fileChange); assertEquals(FileStatus.MODIFIED, fileChange.getFileStatus()); - final Change dirChange = myChangeListManager.getChange(myWorkingCopyDir); + final Change dirChange = changeListManager.getChange(myWorkingCopyDir); assertNotNull(dirChange); assertEquals(FileStatus.MODIFIED, dirChange.getFileStatus()); } diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRenameTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRenameTest.java index 5347c12bf10e..3747ba83ec76 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRenameTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRenameTest.java @@ -8,8 +8,6 @@ import com.intellij.openapi.vcs.FileStatus; import com.intellij.openapi.vcs.VcsConfiguration; import com.intellij.openapi.vcs.VcsException; 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.rollback.RollbackProgressListener; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.TimeoutUtil; @@ -95,8 +93,7 @@ public class SvnRenameTest extends SvnTestCase { "D child" + File.separatorChar + "grandChild" + File.separatorChar + "b.txt"); refreshVfs(); // wait for end of refresh operations initiated from SvnFileSystemListener - final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject); - insideInitializedChangeListManager(changeListManager, () -> { + insideInitializedChangeListManager(() -> { changeListManager.ensureUpToDate(false); List changes = new ArrayList<>(changeListManager.getDefaultChangeList().getChanges()); Assert.assertEquals(4, changes.size()); @@ -116,11 +113,11 @@ public class SvnRenameTest extends SvnTestCase { Assert.assertEquals(FileStatus.DELETED, changeListManager.getStatus(oldChild));*/ } - private void insideInitializedChangeListManager(final ChangeListManager changeListManager, final Runnable runnable) { + private void insideInitializedChangeListManager(final Runnable runnable) { try { runnable.run(); } finally { - ((ChangeListManagerImpl) changeListManager).stopEveryThingIfInTestMode(); + changeListManager.stopEveryThingIfInTestMode(); } } @@ -163,8 +160,7 @@ public class SvnRenameTest extends SvnTestCase { final VirtualFile child = prepareDirectoriesForRename(); renameFileInCommand(child, "newchild"); - final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject); - insideInitializedChangeListManager(changeListManager, () -> { + insideInitializedChangeListManager(() -> { changeListManager.ensureUpToDate(false); final Change change = changeListManager.getChange(myWorkingCopyDir.findChild("newchild")); Assert.assertNotNull(change); @@ -187,8 +183,7 @@ public class SvnRenameTest extends SvnTestCase { final VirtualFile grandChild = createDirInCommand(child, "grandChild"); createFileInCommand(grandChild, "a.txt", "a"); checkin(); - final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject); - insideInitializedChangeListManager(changeListManager, () -> { + insideInitializedChangeListManager(() -> { moveFileInCommand(grandChild, myWorkingCopyDir); refreshVfs(); // wait for end of refresh operations initiated from SvnFileSystemListener changeListManager.ensureUpToDate(false); @@ -217,8 +212,7 @@ public class SvnRenameTest extends SvnTestCase { final VirtualFile unversionedDir = createDirInCommand(child, "uc"); createFileInCommand(unversionedDir, "c.txt", "c"); - final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject); - insideInitializedChangeListManager(changeListManager, () -> { + insideInitializedChangeListManager(() -> { changeListManager.ensureUpToDate(false); Assert.assertEquals(FileStatus.UNKNOWN, changeListManager.getStatus(unversioned)); @@ -232,8 +226,8 @@ public class SvnRenameTest extends SvnTestCase { refreshVfs(); changeListManager.ensureUpToDate(false); final List changes = new ArrayList<>(); - changes.add(ChangeListManager.getInstance(myProject).getChange(myWorkingCopyDir.findChild("newchild").findChild("a.txt"))); - changes.add(ChangeListManager.getInstance(myProject).getChange(myWorkingCopyDir.findChild("newchild"))); + changes.add(changeListManager.getChange(myWorkingCopyDir.findChild("newchild").findChild("a.txt"))); + changes.add(changeListManager.getChange(myWorkingCopyDir.findChild("newchild"))); final List exceptions = new ArrayList<>(); vcs.getRollbackEnvironment().rollbackChanges(changes, exceptions, RollbackProgressListener.EMPTY); @@ -260,8 +254,7 @@ public class SvnRenameTest extends SvnTestCase { verifySorted(runSvn("status"), "A + newchild", "A + newchild" + File.separatorChar + "anew.txt", "D child", "D child" + File.separatorChar + "a.txt", "D child" + File.separatorChar + "grandChild", "D child" + File.separatorChar + "grandChild" + File.separatorChar + "b.txt", "D + newchild" + File.separatorChar + "a.txt"); - final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject); - insideInitializedChangeListManager(changeListManager, () -> { + insideInitializedChangeListManager(() -> { refreshVfs(); // wait for end of refresh operations initiated from SvnFileSystemListener changeListManager.ensureUpToDate(false); final List changes = new ArrayList<>(changeListManager.getDefaultChangeList().getChanges()); diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnResolveTreeAcceptVariantsTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnResolveTreeAcceptVariantsTest.java index 3f3f035d556e..990f3919e3bc 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnResolveTreeAcceptVariantsTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnResolveTreeAcceptVariantsTest.java @@ -4,12 +4,9 @@ package org.jetbrains.idea.svn; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.FilePath; -import com.intellij.openapi.vcs.ProjectLevelVcsManager; import com.intellij.openapi.vcs.VcsConfiguration; 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.ChangeListManagerImpl; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.vcsUtil.VcsUtil; @@ -38,7 +35,6 @@ import static org.junit.Assert.*; public class SvnResolveTreeAcceptVariantsTest extends SvnTestCase { private VirtualFile myTheirs; private SvnClientRunnerImpl mySvnClientRunner; - private ChangeListManager myChangeListManager; @Override @Before @@ -50,7 +46,6 @@ public class SvnResolveTreeAcceptVariantsTest extends SvnTestCase { mySvnClientRunner = new SvnClientRunnerImpl(myRunner); clearWc(true); - myChangeListManager = ChangeListManager.getInstance(myProject); myTraceClient = true; } @@ -86,22 +81,21 @@ public class SvnResolveTreeAcceptVariantsTest extends SvnTestCase { System.out.println("========= TEST " + getTestName(data) + " ========="); } - ((ChangeListManagerImpl) myChangeListManager).stopEveryThingIfInTestMode(); + changeListManager.stopEveryThingIfInTestMode(); myWorkingCopyDir = createDirInCommand(myWorkingCopyDir.getParent(), "test" + cnt); myTheirs = createDirInCommand(myTheirs.getParent(), "theirs" + cnt); mySvnClientRunner.checkout(myRepoUrl, myTheirs); mySvnClientRunner.checkout(myRepoUrl, myWorkingCopyDir); sleep(200); - ProjectLevelVcsManager.getInstance(myProject).setDirectoryMappings( - Collections.singletonList(new VcsDirectoryMapping(myWorkingCopyDir.getPath(), vcs.getName()))); + vcsManager.setDirectoryMappings(Collections.singletonList(new VcsDirectoryMapping(myWorkingCopyDir.getPath(), vcs.getName()))); createSubTree(data); myTheirs.refresh(false, true); final ConflictCreator creator = new ConflictCreator(vcs, myTheirs, myWorkingCopyDir, data, mySvnClientRunner); creator.create(); sleep(200); - ((ChangeListManagerImpl)myChangeListManager).forceGoInTestMode(); + changeListManager.forceGoInTestMode(); refreshChanges(); refreshChanges(); @@ -109,7 +103,7 @@ public class SvnResolveTreeAcceptVariantsTest extends SvnTestCase { final File conflictIoFile = new File(myWorkingCopyDir.getPath(), conflictFile); final FilePath filePath = VcsUtil.getFilePath(conflictIoFile); - final Change change = myChangeListManager.getChange(filePath); + final Change change = changeListManager.getChange(filePath); assertNotNull(change); assertTrue(change instanceof ConflictedSvnChange); final SvnRevisionNumber committedRevision = @@ -227,7 +221,7 @@ public class SvnResolveTreeAcceptVariantsTest extends SvnTestCase { final File conflictIoFile = new File(myWorkingCopyDir.getPath(), conflictFile); final FilePath filePath = VcsUtil.getFilePath(conflictIoFile); - final Change change = myChangeListManager.getChange(filePath); + final Change change = changeListManager.getChange(filePath); assertNotNull(change); assertTrue(change instanceof ConflictedSvnChange); final SvnRevisionNumber committedRevision = diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRollbackTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRollbackTest.java index d87101d4c53c..bf1727ef84d8 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRollbackTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRollbackTest.java @@ -3,7 +3,10 @@ package org.jetbrains.idea.svn; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vcs.*; -import com.intellij.openapi.vcs.changes.*; +import com.intellij.openapi.vcs.changes.Change; +import com.intellij.openapi.vcs.changes.LocalChangeList; +import com.intellij.openapi.vcs.changes.LocallyDeletedChange; +import com.intellij.openapi.vcs.changes.SimpleContentRevision; import com.intellij.openapi.vcs.rollback.RollbackProgressListener; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; @@ -26,13 +29,10 @@ import static org.jetbrains.idea.svn.api.Revision.WORKING; public class SvnRollbackTest extends SvnTestCase { - private ChangeListManager myChangeListManager; - @Override @Before public void setUp() throws Exception { super.setUp(); - myChangeListManager = ChangeListManager.getInstance(myProject); enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD); enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE); @@ -46,7 +46,7 @@ public class SvnRollbackTest extends SvnTestCase { VcsTestUtil.editFileInCommand(myProject, a, "tset"); refreshChanges(); - final Change change = myChangeListManager.getChange(a); + final Change change = changeListManager.getChange(a); Assert.assertNotNull(change); rollbackIMpl(Collections.singletonList(change), Collections.emptyList()); @@ -61,7 +61,7 @@ public class SvnRollbackTest extends SvnTestCase { refreshChanges(); - List lists = myChangeListManager.getChangeLists(); + List lists = changeListManager.getChangeLists(); final HashSet afterCopy = new HashSet<>(allowedAfter); for (LocalChangeList list : lists) { final Collection listChanges = list.getChanges(); @@ -302,7 +302,7 @@ public class SvnRollbackTest extends SvnTestCase { } private Change assertDeletedChange(FilePath fpSource) { - final Change change = myChangeListManager.getChange(fpSource); + final Change change = changeListManager.getChange(fpSource); Assert.assertNotNull(change); Assert.assertNull(change.getAfterRevision()); return change; @@ -328,7 +328,7 @@ public class SvnRollbackTest extends SvnTestCase { } private Change assertCreatedChange(VirtualFile newDir) { - final Change change = myChangeListManager.getChange(newDir); + final Change change = changeListManager.getChange(newDir); Assert.assertNotNull(change); Assert.assertNull(change.getBeforeRevision()); return change; @@ -356,11 +356,11 @@ public class SvnRollbackTest extends SvnTestCase { final Change dirChange = assertRenamedChange(tree.mySourceDir); final Change s1Change = assertMovedChange(tree.myS1File); - FileStatus status = myChangeListManager.getStatus(unverionedDir); + FileStatus status = changeListManager.getStatus(unverionedDir); Assert.assertEquals(FileStatus.UNKNOWN, status); Assert.assertTrue(! wasUnvDir.exists()); - FileStatus fileStatus = myChangeListManager.getStatus(unvFile); + FileStatus fileStatus = changeListManager.getStatus(unvFile); Assert.assertEquals(FileStatus.UNKNOWN, fileStatus); Assert.assertTrue(! wasUnvFile.exists()); @@ -382,7 +382,7 @@ public class SvnRollbackTest extends SvnTestCase { SvnPropertyService.doAddToIgnoreProperty(vcs, false, new VirtualFile[]{ignored}, groupInfo); refreshChanges(); - Assert.assertTrue(FileStatus.IGNORED.equals(myChangeListManager.getStatus(ignored))); + Assert.assertTrue(FileStatus.IGNORED.equals(changeListManager.getStatus(ignored))); VcsTestUtil.renameFileInCommand(myProject, tree.mySourceDir, "renamed"); @@ -392,12 +392,12 @@ public class SvnRollbackTest extends SvnTestCase { final Change s1Change = assertMovedChange(tree.myS1File); final Change s2Change = assertMovedChange(tree.myS2File); Assert.assertTrue(! wasIgnored.exists()); - Assert.assertTrue(FileStatus.IGNORED.equals(myChangeListManager.getStatus(ignored))); + Assert.assertTrue(FileStatus.IGNORED.equals(changeListManager.getStatus(ignored))); rollbackIMpl(Collections.singletonList(dirChange), Collections.emptyList()); ignored = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(wasIgnored); // ignored property was not committed - Assert.assertTrue(FileStatus.UNKNOWN.equals(myChangeListManager.getStatus(ignored))); + Assert.assertTrue(FileStatus.UNKNOWN.equals(changeListManager.getStatus(ignored))); Assert.assertTrue(wasIgnored.exists()); } @@ -414,7 +414,7 @@ public class SvnRollbackTest extends SvnTestCase { checkin(); refreshChanges(); - Assert.assertTrue(FileStatus.IGNORED.equals(myChangeListManager.getStatus(ignored))); + Assert.assertTrue(FileStatus.IGNORED.equals(changeListManager.getStatus(ignored))); VcsTestUtil.renameFileInCommand(myProject, tree.mySourceDir, "renamed"); @@ -424,12 +424,12 @@ public class SvnRollbackTest extends SvnTestCase { final Change s1Change = assertMovedChange(tree.myS1File); final Change s2Change = assertMovedChange(tree.myS2File); Assert.assertTrue(! wasIgnored.exists()); - Assert.assertTrue(FileStatus.IGNORED.equals(myChangeListManager.getStatus(ignored))); + Assert.assertTrue(FileStatus.IGNORED.equals(changeListManager.getStatus(ignored))); rollbackIMpl(Collections.singletonList(dirChange), Collections.emptyList()); ignored = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(wasIgnored); // ignored property was not committed - Assert.assertTrue(FileStatus.IGNORED.equals(myChangeListManager.getStatus(ignored))); + Assert.assertTrue(FileStatus.IGNORED.equals(changeListManager.getStatus(ignored))); Assert.assertTrue(wasIgnored.exists()); } @@ -485,7 +485,7 @@ public class SvnRollbackTest extends SvnTestCase { refreshChanges(); - final List deletedFiles = ((ChangeListManagerImpl)myChangeListManager).getDeletedFiles(); + final List deletedFiles = changeListManager.getDeletedFiles(); Assert.assertNotNull(deletedFiles); Assert.assertTrue(deletedFiles.size() == 1); Assert.assertEquals(wasFile, deletedFiles.get(0).getPath().getIOFile()); @@ -505,7 +505,7 @@ public class SvnRollbackTest extends SvnTestCase { refreshChanges(); - final List deletedFiles = ((ChangeListManagerImpl)myChangeListManager).getDeletedFiles(); + final List deletedFiles = changeListManager.getDeletedFiles(); Assert.assertNotNull(deletedFiles); Assert.assertTrue(deletedFiles.size() == 3); @@ -546,7 +546,7 @@ public class SvnRollbackTest extends SvnTestCase { refreshChanges(); - final List deletedFiles = ((ChangeListManagerImpl)myChangeListManager).getDeletedFiles(); + final List deletedFiles = changeListManager.getDeletedFiles(); Assert.assertNotNull(deletedFiles); Assert.assertTrue(deletedFiles.size() == 3); final Set files = new HashSet<>(); @@ -601,7 +601,7 @@ public class SvnRollbackTest extends SvnTestCase { refreshChanges(); - final List deletedFiles = ((ChangeListManagerImpl)myChangeListManager).getDeletedFiles(); + final List deletedFiles = changeListManager.getDeletedFiles(); if (allowed == null || allowed.isEmpty()) { Assert.assertTrue(deletedFiles == null || deletedFiles.isEmpty()); } @@ -613,14 +613,14 @@ public class SvnRollbackTest extends SvnTestCase { } private Change assertMovedChange(final VirtualFile file) { - final Change change = myChangeListManager.getChange(file); + final Change change = changeListManager.getChange(file); Assert.assertNotNull(change); Assert.assertTrue(change.isMoved()); return change; } private Change assertRenamedChange(final VirtualFile file) { - final Change change = myChangeListManager.getChange(file); + final Change change = changeListManager.getChange(file); Assert.assertNotNull(change); Assert.assertTrue(change.isRenamed()); return change; diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java index 69da59daeec6..25ed96a51303 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTestCase.java @@ -18,11 +18,13 @@ import com.intellij.openapi.ui.TestDialog; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.openapi.vcs.ProjectLevelVcsManager; 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.ex.ProjectLevelVcsManagerEx; +import com.intellij.openapi.vcs.impl.ProjectLevelVcsManagerImpl; import com.intellij.openapi.vcs.update.CommonUpdateProjectAction; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; @@ -73,6 +75,9 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase { protected String myAnotherRepoUrl; protected File myPluginRoot; + protected ProjectLevelVcsManagerImpl vcsManager; + protected ChangeListManagerImpl changeListManager; + protected VcsDirtyScopeManager dirtyScopeManager; protected SvnVcs vcs; protected SvnTestCase() { @@ -147,8 +152,11 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase { initProject(myWcRoot, this.getTestName()); activateVCS(SvnVcs.VCS_NAME); + vcsManager = (ProjectLevelVcsManagerImpl)ProjectLevelVcsManager.getInstance(myProject); + changeListManager = ChangeListManagerImpl.getInstanceImpl(myProject); + dirtyScopeManager = VcsDirtyScopeManager.getInstance(myProject); vcs = SvnVcs.getInstance(myProject); - myGate = new MockChangeListManagerGate(ChangeListManager.getInstance(myProject)); + myGate = new MockChangeListManagerGate(changeListManager); ((StartupManagerImpl)StartupManager.getInstance(myProject)).runPostStartupActivities(); refreshSvnMappingsSynchronously(); @@ -171,8 +179,7 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase { } protected void refreshChanges() { - ChangeListManager changeListManager = ChangeListManager.getInstance(myProject); - VcsDirtyScopeManager.getInstance(myProject).markEverythingDirty(); + dirtyScopeManager.markEverythingDirty(); changeListManager.ensureUpToDate(false); } @@ -183,7 +190,7 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase { @After public void tearDown() throws Exception { - ChangeListManagerImpl.getInstanceImpl(myProject).stopEveryThingIfInTestMode(); + changeListManager.stopEveryThingIfInTestMode(); runInEdtAndWait(() -> { tearDownProject(); @@ -250,10 +257,9 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase { externalURL = myRepoUrl + "/root/target"; } - final ChangeListManagerImpl clManager = (ChangeListManagerImpl)ChangeListManager.getInstance(myProject); final SubTree subTree = new SubTree(myWorkingCopyDir); checkin(); - clManager.stopEveryThingIfInTestMode(); + changeListManager.stopEveryThingIfInTestMode(); sleep(100); final File rootFile = virtualToIoFile(subTree.myRootDir); FileUtil.delete(rootFile); @@ -271,10 +277,10 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase { // above is preparation // start change list manager again - clManager.forceGoInTestMode(); + changeListManager.forceGoInTestMode(); refreshSvnMappingsSynchronously(); - //clManager.ensureUpToDate(false); - //clManager.ensureUpToDate(false); + //changeListManager.ensureUpToDate(false); + //changeListManager.ensureUpToDate(false); } public String getTestDataDir() { @@ -327,8 +333,7 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase { runInAndVerifyIgnoreOutput("mkdir", "-m", "mkdir", myRepoUrl + "/branches"); runInAndVerifyIgnoreOutput("mkdir", "-m", "mkdir", myRepoUrl + "/tags"); - final ChangeListManagerImpl clManager = (ChangeListManagerImpl)ChangeListManager.getInstance(myProject); - clManager.stopEveryThingIfInTestMode(); + changeListManager.stopEveryThingIfInTestMode(); sleep(100); boolean deleted = false; for (int i = 0; i < 5; i++) { @@ -347,10 +352,10 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase { final String branchUrl = myRepoUrl + "/branches/b1"; runInAndVerifyIgnoreOutput("copy", "-q", "-m", "coppy", mainUrl, branchUrl); - clManager.forceGoInTestMode(); + changeListManager.forceGoInTestMode(); refreshSvnMappingsSynchronously(); - //clManager.ensureUpToDate(false); - //clManager.ensureUpToDate(false); + //changeListManager.ensureUpToDate(false); + //changeListManager.ensureUpToDate(false); return branchUrl; } @@ -361,7 +366,6 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase { public void prepareExternal(final boolean commitExternalDefinition, final boolean updateExternal, final boolean anotherRepository) throws Exception { - final ChangeListManagerImpl clManager = (ChangeListManagerImpl)ChangeListManager.getInstance(myProject); final String mainUrl = myRepoUrl + "/root/source"; final String externalURL; if (anotherRepository) { @@ -373,7 +377,7 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase { final SubTree subTree = new SubTree(myWorkingCopyDir); checkin(); - clManager.stopEveryThingIfInTestMode(); + changeListManager.stopEveryThingIfInTestMode(); sleep(100); final File rootFile = virtualToIoFile(subTree.myRootDir); FileUtil.delete(rootFile); @@ -402,10 +406,10 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase { // above is preparation // start change list manager again - clManager.forceGoInTestMode(); + changeListManager.forceGoInTestMode(); refreshSvnMappingsSynchronously(); - //clManager.ensureUpToDate(false); - //clManager.ensureUpToDate(false); + //changeListManager.ensureUpToDate(false); + //changeListManager.ensureUpToDate(false); } protected void createAnotherRepo() throws Exception { diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java index 877e337f3fd4..a787228335f2 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java @@ -3,7 +3,6 @@ package org.jetbrains.idea.svn; import com.intellij.openapi.vcs.VcsConfiguration; import com.intellij.openapi.vcs.changes.Change; -import com.intellij.openapi.vcs.changes.ChangeListManager; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.vcsUtil.VcsUtil; @@ -483,7 +482,6 @@ public class SvnTreeConflictDataTest extends SvnTestCase { @NotNull BiConsumer checker) throws Exception { String conflictFile = createConflict(data, createSubtree); - ChangeListManager changeListManager = ChangeListManager.getInstance(myProject); refreshChanges(); Change change;