mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
vfs should always find the mock vcs root in tests, refresh it explicitly
This commit is contained in:
+3
-2
@@ -17,7 +17,6 @@ package com.intellij.openapi.vcs.changes.pending;
|
||||
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.util.Getter;
|
||||
import com.intellij.openapi.util.io.FileUtil;
|
||||
import com.intellij.openapi.vcs.AbstractVcs;
|
||||
import com.intellij.openapi.vcs.ProjectLevelVcsManager;
|
||||
import com.intellij.openapi.vcs.VcsDirectoryMapping;
|
||||
@@ -29,6 +28,7 @@ import com.intellij.openapi.vcs.changes.committed.MockAbstractVcs;
|
||||
import com.intellij.openapi.vcs.changes.committed.MockDelayingChangeProvider;
|
||||
import com.intellij.openapi.vcs.impl.ProjectLevelVcsManagerImpl;
|
||||
import com.intellij.openapi.vcs.impl.projectlevelman.AllVcses;
|
||||
import com.intellij.openapi.vfs.LocalFileSystem;
|
||||
import com.intellij.openapi.vfs.VirtualFile;
|
||||
|
||||
import java.io.File;
|
||||
@@ -51,13 +51,14 @@ public class DuringChangeListManagerUpdateTestScheme {
|
||||
|
||||
final File mockVcsRoot = new File(tmpDirPath, "mock");
|
||||
mockVcsRoot.mkdir();
|
||||
final VirtualFile vRoot = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(mockVcsRoot);
|
||||
|
||||
final ProjectLevelVcsManagerImpl projectLevelVcsManager = (ProjectLevelVcsManagerImpl) ProjectLevelVcsManager.getInstance(project);
|
||||
projectLevelVcsManager.registerVcs(vcs);
|
||||
//projectLevelVcsManager.setDirectoryMapping(mockVcsRoot.getAbsolutePath(), vcs.getName());
|
||||
final ArrayList<VcsDirectoryMapping> list =
|
||||
new ArrayList<VcsDirectoryMapping>(projectLevelVcsManager.getDirectoryMappings());
|
||||
list.add(new VcsDirectoryMapping(FileUtil.toSystemIndependentName(mockVcsRoot.getAbsolutePath()), vcs.getName()));
|
||||
list.add(new VcsDirectoryMapping(vRoot.getPath(), vcs.getName()));
|
||||
projectLevelVcsManager.setDirectoryMappings(list);
|
||||
|
||||
AbstractVcs vcsFound = projectLevelVcsManager.findVcsByName(vcs.getName());
|
||||
|
||||
Reference in New Issue
Block a user