vcs tests: simplify: just pass the CLM instance to the constructor

This commit is contained in:
Kirill Likhodedov
2017-02-26 21:45:19 +00:00
parent ef24287859
commit fbd634122b
@@ -33,12 +33,8 @@ import com.intellij.testFramework.vcs.MockChangeListManager;
import com.intellij.testFramework.vcs.MockContentRevision;
import com.intellij.vcsUtil.VcsUtil;
import java.lang.reflect.Field;
import java.util.*;
/**
* @author Kirill Likhodedov
*/
public class LocalChangesUnderRootsTest extends PlatformTestCase {
private LocalChangesUnderRoots myLocalChangesUnderRoots;
@@ -51,10 +47,7 @@ public class LocalChangesUnderRootsTest extends PlatformTestCase {
myChangeListManager = new MockChangeListManager();
myBaseDir = myProject.getBaseDir();
myLocalChangesUnderRoots = new LocalChangesUnderRoots(ChangeListManager.getInstance(myProject),
ProjectLevelVcsManager.getInstance(myProject));
substituteChangeListManager();
myLocalChangesUnderRoots = new LocalChangesUnderRoots(myChangeListManager, ProjectLevelVcsManager.getInstance(myProject));
}
@Override
@@ -63,13 +56,6 @@ public class LocalChangesUnderRootsTest extends PlatformTestCase {
super.tearDown();
}
// This is not good, but declaring MockChangeListManager might break other tests
private void substituteChangeListManager() throws NoSuchFieldException, IllegalAccessException {
Field myChangeManager = LocalChangesUnderRoots.class.getDeclaredField("myChangeManager");
myChangeManager.setAccessible(true);
myChangeManager.set(myLocalChangesUnderRoots, myChangeListManager);
}
public void testChangesInTwoGitRoots() {
AllVcsesI myVcses = AllVcses.getInstance(myProject);
myVcses.registerManually(new MockAbstractVcs(myProject, "Mock"));