From 2cdd52078f36de1a4a40acd5e1da9f7856fc1436 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Wed, 11 Jan 2012 15:20:00 +0100
Subject: [PATCH] vfs should always find the mock vcs root in tests, refresh it
 explicitly

---
 .../pending/DuringChangeListManagerUpdateTestScheme.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/pending/DuringChangeListManagerUpdateTestScheme.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/pending/DuringChangeListManagerUpdateTestScheme.java
index cf17d05c968c..fe4295ba504b 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/pending/DuringChangeListManagerUpdateTestScheme.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/pending/DuringChangeListManagerUpdateTestScheme.java
@@ -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());