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

Avoid grand VFS refresh in tests

Browse Source
This commit is contained in:
Roman Shevchenko
2010-12-09 18:19:56 +03:00
parent 37b8c41dc9
commit cd24ebee0b
3 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
+2 -2
View File
@@ -45,7 +45,6 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiFile;
import com.intellij.psi.impl.source.PostprocessReformattingAspect;
@@ -241,7 +240,8 @@ public abstract class CodeInsightTestCase extends PsiTestCase {
}
}));
VirtualFileManager.getInstance().refresh(false);
// grand VFS refresh significantly slows down local tests and generally not needed
//VirtualFileManager.getInstance().refresh(false);
}
else {
editorInfos = new LinkedHashMap<VirtualFile, EditorInfo>();
platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemImpl.java
+7 -15
View File
@@ -21,11 +21,9 @@ import com.intellij.openapi.components.ApplicationComponent;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.vfs.JarFileSystem;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.impl.win32.Win32LocalFileSystem;
import com.intellij.openapi.vfs.newvfs.ManagingFS;
import com.intellij.openapi.vfs.newvfs.NewVirtualFile;
import com.intellij.openapi.vfs.newvfs.RefreshQueue;
@@ -122,14 +120,7 @@ public final class LocalFileSystemImpl extends LocalFileSystemBase implements Ap
if (myWatcher.isOperational()) {
new StoreRefreshStatusThread().start();
}
if (SystemInfo.isWindows &&
Win32LocalFileSystem.isAvailable() &&
Registry.is("filesystem.useNative")) {
myNativeFileSystem = null; //Win32LocalFileSystem.getWin32Instance();
}
else {
myNativeFileSystem = null;
}
myNativeFileSystem = null;
}
public void initComponent() {
@@ -153,11 +144,12 @@ public final class LocalFileSystemImpl extends LocalFileSystemBase implements Ap
}
}
ApplicationManager.getApplication().runWriteAction(new Runnable() {
public void run() {
refresh(false);
}
});
// grand VFS refresh significantly slows down local tests and generally not needed
//ApplicationManager.getApplication().runWriteAction(new Runnable() {
// public void run() {
// refresh(false);
// }
//});
myRootsToWatch.clear();
platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java
+7 -7
View File
@@ -54,7 +54,6 @@ import com.intellij.openapi.util.EmptyRunnable;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.openapi.vfs.impl.VirtualFilePointerManagerImpl;
import com.intellij.openapi.vfs.impl.local.LocalFileSystemImpl;
import com.intellij.openapi.vfs.newvfs.ManagingFS;
@@ -596,12 +595,13 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro
public static File createTempDir(@NonNls final String prefix) throws IOException {
final File tempDirectory = FileUtil.createTempDirectory(TEST_DIR_PREFIX + prefix, null);
myFilesToDelete.add(tempDirectory);
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override
public void run() {
VirtualFileManager.getInstance().refresh(false);
}
});
// grand VFS refresh significantly slows down local tests and generally not needed
//ApplicationManager.getApplication().runWriteAction(new Runnable() {
// @Override
// public void run() {
// VirtualFileManager.getInstance().refresh(false);
// }
//});
return tempDirectory;
}