thread leaks

[idea/community.git] / platform / vcs-impl / testSrc / com / intellij / openapi / vcs / LocalChangesUnderRootsTest.java

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 cd00c8f74afce709776de223d178300d2cc38551..14d1d817b7377e93b288b83f32f81f05499ab2ed 100644 (file)
--- a/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/LocalChangesUnderRootsTest.java
+++ b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/LocalChangesUnderRootsTest.java
@@ -1,11 +1,26 @@
+/*
+ * Copyright 2000-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.intellij.openapi.vcs;
 
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
+import com.intellij.openapi.vcs.changes.ChangeListManagerImpl;
 import com.intellij.openapi.vcs.changes.ContentRevision;
 import com.intellij.openapi.vcs.changes.committed.MockAbstractVcs;
-import com.intellij.testFramework.vcs.MockContentRevision;
 import com.intellij.openapi.vcs.changes.ui.ChangesComparator;
 import com.intellij.openapi.vcs.history.VcsRevisionNumber;
 import com.intellij.openapi.vcs.impl.LocalChangesUnderRoots;
@@ -15,8 +30,8 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.testFramework.PlatformTestCase;
 import com.intellij.testFramework.VfsTestUtil;
 import com.intellij.testFramework.vcs.MockChangeListManager;
-import org.junit.Before;
-import org.junit.Test;
+import com.intellij.testFramework.vcs.MockContentRevision;
+import com.intellij.vcsUtil.VcsUtil;
 
 import java.lang.reflect.Field;
 import java.util.*;
@@ -30,7 +45,7 @@ public class LocalChangesUnderRootsTest extends PlatformTestCase {
   private MockChangeListManager myChangeListManager;
   private VirtualFile myBaseDir;
 
-  @Before
+  @Override
   protected void setUp() throws Exception {
     super.setUp();
 
@@ -42,6 +57,12 @@ public class LocalChangesUnderRootsTest extends PlatformTestCase {
     substituteChangeListManager();
   }
 
+  @Override
+  protected void tearDown() throws Exception {
+    ((ChangeListManagerImpl) ChangeListManager.getInstance(myProject)).stopEveryThingIfInTestMode();
+    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");
@@ -49,7 +70,6 @@ public class LocalChangesUnderRootsTest extends PlatformTestCase {
     myChangeManager.set(myLocalChangesUnderRoots, myChangeListManager);
   }
 
-  @Test
   public void testChangesInTwoGitRoots() {
     AllVcsesI myVcses = AllVcses.getInstance(myProject);
     myVcses.registerManually(new MockAbstractVcs(myProject, "Mock"));
@@ -66,7 +86,7 @@ public class LocalChangesUnderRootsTest extends PlatformTestCase {
     
     Map<VirtualFile, Collection<Change>> expected = new HashMap<VirtualFile, Collection<Change>>();
     expected.put(roots.get(0), Arrays.asList(changeBeforeCommunity, changeAfterCommunity));
-    expected.put(roots.get(1), Arrays.asList(changeInCommunity));
+    expected.put(roots.get(1), Collections.singletonList(changeInCommunity));
 
     Map<VirtualFile, Collection<Change>> changesUnderRoots = myLocalChangesUnderRoots.getChangesUnderRoots(roots);
     assertEqualMaps(expected, changesUnderRoots);
@@ -114,7 +134,7 @@ public class LocalChangesUnderRootsTest extends PlatformTestCase {
 
   private Change createChangeForPath(String path) {
     VirtualFile file = VfsTestUtil.createFile(myBaseDir, path);
-    FilePath filePath = new FilePathImpl(file);
+    FilePath filePath = VcsUtil.getFilePath(file);
     ContentRevision beforeRevision = new MockContentRevision(filePath, new VcsRevisionNumber.Int(1));
     ContentRevision afterRevision = new MockContentRevision(filePath, new VcsRevisionNumber.Int(2));
     return new Change(beforeRevision, afterRevision);