Mercurial > hg > release > icedtea7-forest-2.3 > jdk
changeset 5433:1ff37a4aa198
7142847: TEST_BUG: java/nio/file/WatchService/SensitivityModifier.java has incorrect @run tag, runs Basic
Reviewed-by: chegar
| author | alanb |
|---|---|
| date | Tue, 07 Feb 2012 13:28:32 +0000 |
| parents | 1c41d5e49584 |
| children | c0f0ceab769a |
| files | test/java/nio/file/WatchService/Basic.java test/java/nio/file/WatchService/SensitivityModifier.java |
| diffstat | 2 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/test/java/nio/file/WatchService/Basic.java Mon Jun 18 11:19:48 2012 +0100 +++ b/test/java/nio/file/WatchService/Basic.java Tue Feb 07 13:28:32 2012 +0000 @@ -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 @@ 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 @@ } // 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"); }
--- a/test/java/nio/file/WatchService/SensitivityModifier.java Mon Jun 18 11:19:48 2012 +0100 +++ b/test/java/nio/file/WatchService/SensitivityModifier.java Tue Feb 07 13:28:32 2012 +0000 @@ -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.*;