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

DRY: migrate VcsRepositoryManagerTest to extend VcsPlatformTest

Browse Source
This commit is contained in:
Kirill Likhodedov
2016-03-30 18:50:17 +03:00
parent bdc02dfc91
commit a39aca8a11
2 changed files with 14 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/dvcs-impl/dvcs-impl.iml
+1
View File
@@ -21,5 +21,6 @@
<orderEntry type="module" module-name="dvcs-api" />
<orderEntry type="module" module-name="testFramework" scope="TEST" />
<orderEntry type="library" scope="TEST" name="mockito" level="project" />
<orderEntry type="module" module-name="vcs-tests" scope="TEST" />
</component>
</module>
platform/dvcs-impl/testSrc/com.intellij.dvcs/VcsRepositoryManagerTest.java
+13 -37
View File
@@ -20,16 +20,13 @@ import com.intellij.dvcs.repo.VcsRepositoryCreator;
import com.intellij.dvcs.repo.VcsRepositoryManager;
import com.intellij.openapi.extensions.ExtensionPoint;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vcs.ProjectLevelVcsManager;
import com.intellij.openapi.vcs.VcsKey;
import com.intellij.openapi.vcs.changes.committed.MockAbstractVcs;
import com.intellij.openapi.vcs.impl.ProjectLevelVcsManagerImpl;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.testFramework.UsefulTestCase;
import com.intellij.testFramework.fixtures.IdeaProjectTestFixture;
import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory;
import com.intellij.util.ObjectUtils;
import com.intellij.vcs.test.VcsPlatformTest;
import com.intellij.vcsUtil.VcsUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -42,52 +39,33 @@ import java.util.concurrent.TimeUnit;
import static com.intellij.openapi.vcs.Executor.cd;
import static com.intellij.openapi.vcs.Executor.mkdir;
public class VcsRepositoryManagerTest extends UsefulTestCase {
public class VcsRepositoryManagerTest extends VcsPlatformTest {
private ProjectLevelVcsManagerImpl myProjectLevelVcsManager;
private VcsRepositoryManager myGlobalRepositoryManager;
private MockAbstractVcs myVcs;
private Project myProject;
private IdeaProjectTestFixture myProjectFixture;
private CountDownLatch CONTINUE_MODIFY;
private CountDownLatch READY_TO_READ;
private static final String LOCK_ERROR_TEXT = "Possible dead lock occurred!";
private VirtualFile myProjectRoot;
private VcsRepositoryCreator myMockCreator;
@Override
protected void setUp() throws Exception {
super.setUp();
try {
myProjectFixture = IdeaTestFixtureFactory.getFixtureFactory().createFixtureBuilder(getTestName(true)).getFixture();
myProjectFixture.setUp();
}
catch (Exception e) {
super.tearDown();
throw e;
}
try {
myProject = myProjectFixture.getProject();
myProjectRoot = myProject.getBaseDir();
cd(myProjectRoot);
cd(myProjectRoot);
myVcs = new MockAbstractVcs(myProject);
myProjectLevelVcsManager = (ProjectLevelVcsManagerImpl)ProjectLevelVcsManager.getInstance(myProject);
myProjectLevelVcsManager.registerVcs(myVcs);
READY_TO_READ = new CountDownLatch(1);
CONTINUE_MODIFY = new CountDownLatch(1);
myVcs = new MockAbstractVcs(myProject);
myProjectLevelVcsManager = (ProjectLevelVcsManagerImpl)ProjectLevelVcsManager.getInstance(myProject);
myProjectLevelVcsManager.registerVcs(myVcs);
READY_TO_READ = new CountDownLatch(1);
CONTINUE_MODIFY = new CountDownLatch(1);
myMockCreator = createMockRepositoryCreator();
ExtensionPoint<VcsRepositoryCreator> point = getExtensionPoint();
point.registerExtension(myMockCreator);
myMockCreator = createMockRepositoryCreator();
ExtensionPoint<VcsRepositoryCreator> point = getExtensionPoint();
point.registerExtension(myMockCreator);
myGlobalRepositoryManager = new VcsRepositoryManager(myProject, myProjectLevelVcsManager);
myGlobalRepositoryManager.initComponent();
}
catch (Exception e) {
tearDown();
throw e;
}
myGlobalRepositoryManager = new VcsRepositoryManager(myProject, myProjectLevelVcsManager);
myGlobalRepositoryManager.initComponent();
}
@NotNull
@@ -106,8 +84,6 @@ public class VcsRepositoryManagerTest extends UsefulTestCase {
}
}
finally {
// could not be Null or not created, because first catch clause in setUp throws exception with super.tearDown()
myProjectFixture.tearDown();
super.tearDown();
}
}