From fbd634122bf0aaaabe1db9c843ee921087c1d053 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Sun, 26 Feb 2017 21:45:19 +0000 Subject: [PATCH] vcs tests: simplify: just pass the CLM instance to the constructor --- .../openapi/vcs/LocalChangesUnderRootsTest.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/LocalChangesUnderRootsTest.java b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/LocalChangesUnderRootsTest.java index b89cf9d2ffff..6d7601abb91d 100644 --- a/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/LocalChangesUnderRootsTest.java +++ b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/LocalChangesUnderRootsTest.java @@ -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"));