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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
anna
2012-07-16 13:07:11 +02:00
parent 5797511110 c5f3305f49
commit 5b68e2913b
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/FileWatcherTest.java
+13 -4
View File
@@ -45,7 +45,7 @@ import java.util.*;
public class FileWatcherTest extends PlatformLangTestCase {
private static final int INTER_RESPONSE_DELAY = 500; // time to wait for a next event in a sequence
private static final int NATIVE_PROCESS_DELAY = 10 * INTER_RESPONSE_DELAY; // time to wait for a native watcher response
private static final int NATIVE_PROCESS_DELAY = 60000; // time to wait for a native watcher response
private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vfs.impl.local.FileWatcher");
@@ -57,6 +57,7 @@ public class FileWatcherTest extends PlatformLangTestCase {
private final Runnable myNotifier = new Runnable() {
@Override
public void run() {
LOG.debug("-- (event, expected=" + myAccept + ")");
if (!myAccept) return;
synchronized (myAlarm) {
myAlarm.cancelAllRequests();
@@ -74,6 +75,7 @@ public class FileWatcherTest extends PlatformLangTestCase {
}
};
private final Object myWaiter = new Object();
private int myTimeout = NATIVE_PROCESS_DELAY;
private final List<VFileEvent> myEvents = new ArrayList<VFileEvent>();
@Override
@@ -226,8 +228,14 @@ public class FileWatcherTest extends PlatformLangTestCase {
assertEvent(VFileContentChangeEvent.class, watchedFile.getAbsolutePath());
myAccept = true;
FileUtil.writeToFile(unwatchedFile, "new content");
assertEvent(VFileEvent.class);
try {
myTimeout = 10 * INTER_RESPONSE_DELAY;
FileUtil.writeToFile(unwatchedFile, "new content");
assertEvent(VFileEvent.class);
}
finally {
myTimeout = NATIVE_PROCESS_DELAY;
}
}
finally {
unwatch(request);
@@ -544,10 +552,11 @@ public class FileWatcherTest extends PlatformLangTestCase {
action.run();
}
int timeout = myTimeout;
synchronized (myWaiter) {
try {
//noinspection WaitNotInLoop
myWaiter.wait(NATIVE_PROCESS_DELAY);
myWaiter.wait(timeout);
}
catch (InterruptedException e) {
LOG.warn(e);