From f171a16b5252730d5dc7d0f968d0c8a2aee57188 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Thu, 31 May 2018 18:49:53 +0300 Subject: [PATCH] vcs: fix Project memory leak via Mockito --- .../com/intellij/tasks/vcs/TaskVcsTest.java | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/TaskVcsTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/TaskVcsTest.java index f0af94160134..b08c33564e68 100644 --- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/TaskVcsTest.java +++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/TaskVcsTest.java @@ -330,21 +330,16 @@ public class TaskVcsTest extends CodeInsightFixtureTestCase { private void commitChanges(LocalChangeList changeList, List changes) { String commitMessage = changeList.getName(); - CheckinProjectPanel panel = Mockito.mock(CheckinProjectPanel.class); - try { - when(panel.getProject()).thenReturn(getProject()); - when(panel.getCommitMessage()).thenReturn(commitMessage); + CheckinProjectPanel panel = Mockito.mock(CheckinProjectPanel.class, Mockito.withSettings().stubOnly()); + when(panel.getProject()).thenReturn(getProject()); + when(panel.getCommitMessage()).thenReturn(commitMessage); - CheckinHandler checkinHandler = new TaskCheckinHandlerFactory().createHandler(panel, new CommitContext()); + CheckinHandler checkinHandler = new TaskCheckinHandlerFactory().createHandler(panel, new CommitContext()); - List handlers = ContainerUtil.list(checkinHandler); - CommitHelper helper = new CommitHelper(getProject(), changeList, changes, "Commit", commitMessage, handlers, false, true, - new PseudoMap<>(), null); - helper.doCommit(); - } - finally { - Mockito.reset(panel); - } + List handlers = ContainerUtil.list(checkinHandler); + CommitHelper helper = new CommitHelper(getProject(), changeList, changes, "Commit", commitMessage, handlers, false, true, + new PseudoMap<>(), null); + helper.doCommit(); } private LocalChangeList addChangeList(String title) {