mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
[hg]: tests fixed: do not create incoming/outgoing widget in test mode
* problem appeared only after manual modification directory mappings, cause it led to widgets activationswitched on for default project; * update hg patch and settings activation for basic hg test class also;
This commit is contained in:
@@ -59,13 +59,13 @@ public abstract class HgPlatformTest extends VcsPlatformTest {
|
||||
super.setUp();
|
||||
|
||||
cd(myProjectRoot);
|
||||
hg("version");
|
||||
|
||||
createRepository(myProjectRoot);
|
||||
myVcs = HgVcs.getInstance(myProject);
|
||||
assertNotNull(myVcs);
|
||||
myVcs.getGlobalSettings().setHgExecutable(HgExecutor.getHgExecutable());
|
||||
myVcs.getProjectSettings().setCheckIncomingOutgoing(false);
|
||||
myVcs.checkVersion();
|
||||
hg("version");
|
||||
createRepository(myProjectRoot);
|
||||
myRepository = myProjectRoot;
|
||||
setUpHgrc(myRepository);
|
||||
}
|
||||
|
||||
@@ -58,6 +58,9 @@ public class HgTaskBranchesTest extends TaskBranchesTest {
|
||||
hg("commit -m another -u abc");
|
||||
hg("up -r 0");
|
||||
ProjectLevelVcsManagerImpl vcsManager = (ProjectLevelVcsManagerImpl)ProjectLevelVcsManager.getInstance(myProject);
|
||||
HgVcs hgVcs = HgVcs.getInstance(myProject);
|
||||
assert hgVcs != null;
|
||||
hgVcs.getProjectSettings().setCheckIncomingOutgoing(false);
|
||||
vcsManager.setDirectoryMapping(root, HgVcs.VCS_NAME);
|
||||
VirtualFile file = LocalFileSystem.getInstance().findFileByIoFile(new File(root));
|
||||
HgRepository repository = HgUtil.getRepositoryManager(myProject).getRepositoryForRoot(file);
|
||||
@@ -86,6 +89,5 @@ public class HgTaskBranchesTest extends TaskBranchesTest {
|
||||
return ((HgRepository)repository).getOpenedBranches().size() +
|
||||
((HgRepository)repository).getBookmarks().size();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user