fix tests

Author: monosoul

src/test/java/com/github/monosoul/git/updateindex/extended/AbstractExtendedUpdateIndexAction_ActionPerformedTest.java

@@ -19,7 +19,8 @@
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
-import com.intellij.mock.MockApplicationEx;
+
+import com.intellij.mock.MockApplication;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vcs.ProjectLevelVcsManager;
@@ -44,18 +45,15 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.stubbing.Answer;
-import org.picocontainer.MutablePicoContainer;
 
 class AbstractExtendedUpdateIndexAction_ActionPerformedTest {
 
     private static final int LIMIT = 10;
 
-    private MockApplicationEx application;
+    private MockApplication application;
     @Mock
     private Disposable parent;
     @Mock
-    private MutablePicoContainer picoContainer;
-    @Mock
     private Git git;
     @Mock
     private VcsContext vcsContext;
@@ -76,15 +74,16 @@ class AbstractExtendedUpdateIndexAction_ActionPerformedTest {
     @BeforeEach
     void setUp() {
         initMocks(this);
-        application = spy(new MockApplicationEx(parent));
+        application = new MockApplication(parent);
         setApplication(application, parent);
 
-        doReturn(picoContainer).when(application).getPicoContainer();
-        doReturn(git).when(picoContainer).getComponentInstance(Git.class.getName());
+        application.registerService(Git.class, git, parent);
 
         doReturn(project).when(vcsContext).getProject();
         doReturn(vcsManager).when(project).getComponent(ProjectLevelVcsManager.class);
+        doReturn(vcsManager).when(project).getService(ProjectLevelVcsManager.class);
         doReturn(dirtyScopeManager).when(project).getComponent(VcsDirtyScopeManager.class);
+        doReturn(dirtyScopeManager).when(project).getService(VcsDirtyScopeManager.class);
 
         doReturn(gitLineHandler).when(gitLineHandlerCreator).apply(any(Entry.class));
         doReturn(gitCommandResult).when(git).runCommand(gitLineHandler);

src/test/java/com/github/monosoul/git/updateindex/extended/AbstractExtendedUpdateIndexAction_UpdateTest.java

@@ -35,6 +35,7 @@ void setUp() {
 
         doReturn(project).when(vcsContext).getProject();
         doReturn(vcsManager).when(project).getComponent(ProjectLevelVcsManager.class);
+        doReturn(vcsManager).when(project).getService(ProjectLevelVcsManager.class);
         doReturn(true).when(vcsManager).hasActiveVcss();
     }
 

src/test/java/com/github/monosoul/git/updateindex/extended/GitLineHandlerCreatorTest.java

@@ -11,9 +11,10 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
+
+import com.intellij.mock.MockApplication;
 import com.intellij.mock.MockVirtualFile;
 import com.intellij.openapi.Disposable;
-import com.intellij.openapi.application.Application;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vcs.ProjectLevelVcsManager;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -28,20 +29,16 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mock;
-import org.picocontainer.PicoContainer;
 
 class GitLineHandlerCreatorTest {
 
     private static final int LIMIT = 10;
     private static GitVersion CAN_NOT_OVERRIDE_GIT_CONFIG_FOR_COMMAND = new GitVersion(1, 7, 1, 0);
 
-    @Mock
-    private Application application;
+    private MockApplication application;
     @Mock
     private Disposable parent;
     @Mock
-    private PicoContainer picoContainer;
-    @Mock
     private GitExecutableManager gitExecutableManager;
     @Mock
     private ProjectLevelVcsManager vcsManager;
@@ -55,16 +52,17 @@ class GitLineHandlerCreatorTest {
     @BeforeEach
     void setUp() {
         initMocks(this);
+        application = new MockApplication(parent);
         setApplication(application, parent);
 
-        doReturn(picoContainer)
-                .when(application).getPicoContainer();
-        doReturn(gitExecutableManager)
-                .when(picoContainer).getComponentInstance(GitExecutableManager.class.getName());
+        application.registerService(GitExecutableManager.class, gitExecutableManager, parent);
+
         doReturn(randomAlphabetic(LIMIT))
                 .when(gitExecutableManager).getPathToGit(project);
         doReturn(vcsManager)
                 .when(project).getComponent(ProjectLevelVcsManager.class);
+        doReturn(vcsManager)
+                .when(project).getService(ProjectLevelVcsManager.class);
         doReturn(gitVcs)
                 .when(vcsManager).findVcsByName(GitVcs.NAME);
         doReturn(CAN_NOT_OVERRIDE_GIT_CONFIG_FOR_COMMAND)