MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible "CommittedChangesCacheTest.tearDown()" leak, simplify

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2017-06-27 19:39:32 +03:00
parent a178f43b09
commit f87f56d6ae
1 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-tests/testSrc/com/intellij/openapi/vcs/changes/committed/CommittedChangesCacheTest.java
+14 -31
View File
@@ -21,7 +21,6 @@ import com.intellij.openapi.util.Pair;
import com.intellij.openapi.vcs.ProjectLevelVcsManager;
import com.intellij.openapi.vcs.RepositoryLocation;
import com.intellij.openapi.vcs.VcsDirectoryMapping;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vcs.changes.ContentRevision;
import com.intellij.openapi.vcs.history.VcsRevisionNumber;
@@ -33,16 +32,17 @@ import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.testFramework.PlatformTestCase;
import com.intellij.testFramework.PsiTestUtil;
import com.intellij.testFramework.RunAll;
import com.intellij.util.messages.MessageBusConnection;
import com.intellij.vcsUtil.VcsUtil;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static java.util.Collections.singletonList;
/**
* @author yole
*/
@@ -71,7 +71,7 @@ public class CommittedChangesCacheTest extends PlatformTestCase {
myVcs.setDiffProvider(myDiffProvider);
myVcsManager.registerVcs(myVcs);
myVcsManager.setDirectoryMappings(Arrays.asList(new VcsDirectoryMapping("", myVcs.getName())));
myVcsManager.setDirectoryMappings(singletonList(new VcsDirectoryMapping("", myVcs.getName())));
myCache = CommittedChangesCache.getInstance(getProject());
@@ -83,20 +83,15 @@ public class CommittedChangesCacheTest extends PlatformTestCase {
@Override
protected void tearDown() throws Exception {
if (myConnection != null) {
myConnection.disconnect();
myConnection = null;
}
myVcsManager.unregisterVcs(myVcs);
myVcsManager = null;
myVcs = null;
myProvider = null;
myDiffProvider = null;
myCache.clearCaches(EmptyRunnable.INSTANCE);
myCache = null;
myContentRoot = null;
myListener = null;
super.tearDown();
new RunAll(
() -> {
if (myConnection != null) myConnection.disconnect();
},
() -> myVcsManager.unregisterVcs(myVcs),
() -> myCache.clearCaches(EmptyRunnable.INSTANCE),
() -> clearFields(this),
() -> super.tearDown()
).run();
}
public void testEmpty() throws Exception {
@@ -357,7 +352,7 @@ public class CommittedChangesCacheTest extends PlatformTestCase {
return MockCommittedChangesProvider.createMockChange(new File(myTempDir, path).toString(), revision);
}
private static class MockListener implements CommittedChangesListener {
private static class MockListener extends CommittedChangesAdapter {
private final List<CommittedChangeList> myLoadedChanges = new ArrayList<>();
private final List<List<CommittedChangeList>> myIncomingChangesUpdates = new ArrayList<>();
@@ -366,23 +361,11 @@ public class CommittedChangesCacheTest extends PlatformTestCase {
myLoadedChanges.addAll(changes);
}
@Override
public void changesCleared() {
}
@Override
public void presentationChanged() {
}
@Override
public void incomingChangesUpdated(final List<CommittedChangeList> receivedChanges) {
myIncomingChangesUpdates.add(receivedChanges);
}
@Override
public void refreshErrorStatusChanged(@Nullable VcsException lastError) {
}
public int getIncomingChangesUpdateCount() {
return myIncomingChangesUpdates.size();
}