7142847: TEST_BUG: java/nio/file/WatchService/SensitivityModifier.java has incorrect @run tag, runs Basic

Reviewed-by: chegar
This commit is contained in:
Alan Bateman 2012-02-07 13:28:32 +00:00
parent 6667bfa0a9
commit b37db2a9db
2 changed files with 7 additions and 7 deletions

View File

@ -25,7 +25,7 @@
* @bug 4313887 6838333 7017446
* @summary Unit test for java.nio.file.WatchService
* @library ..
* @run main/timeout=120 Basic
* @run main Basic
*/
import java.nio.file.*;
@ -281,11 +281,11 @@ public class Basic {
System.out.println("poll with timeout...");
try {
long start = System.currentTimeMillis();
long start = System.nanoTime();
key = watcher.poll(3000, TimeUnit.MILLISECONDS);
if (key != null)
throw new RuntimeException("no keys registered");
long waited = System.currentTimeMillis() - start;
long waited = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start);
if (waited < 2900)
throw new RuntimeException("poll was too short");
} catch (InterruptedException x) {
@ -358,14 +358,14 @@ public class Basic {
}
// assume that poll throws exception immediately
long start = System.currentTimeMillis();
long start = System.nanoTime();
try {
watcher.poll(10000, TimeUnit.MILLISECONDS);
throw new RuntimeException("ClosedWatchServiceException not thrown");
} catch (InterruptedException x) {
throw new RuntimeException(x);
} catch (ClosedWatchServiceException x) {
long waited = System.currentTimeMillis() - start;
long waited = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start);
if (waited > 5000)
throw new RuntimeException("poll was too long");
}

View File

@ -23,9 +23,9 @@
/* @test
* @bug 4313887
* @summary Sanity test for Sun-specific sensitivyt level watch event modifier
* @summary Sanity test for Sun-specific sensitivity level watch event modifier
* @library ..
* @run main/timeout=330 Basic
* @run main/timeout=240 SensitivityModifier
*/
import java.nio.file.*;