ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/SystemTest.java
(Generate patch)

Comparing jsr166/src/test/tck/SystemTest.java (file contents):
Revision 1.13 by jsr166, Sat Apr 25 04:55:31 2015 UTC vs.
Revision 1.14 by jsr166, Sun May 14 03:09:25 2017 UTC

# Line 27 | Line 27 | public class SystemTest extends JSR166Te
27  
28      /**
29       * Nanos between readings of millis is no longer than millis (plus
30 <     * possible rounding).
30 >     * possible rounding), and vice versa.
31       * This shows only that nano timing not (much) worse than milli.
32       */
33 <    public void testNanoTime1() throws InterruptedException {
34 <        long m1 = System.currentTimeMillis();
35 <        Thread.sleep(1);
36 <        long n1 = System.nanoTime();
37 <        Thread.sleep(SHORT_DELAY_MS);
38 <        long n2 = System.nanoTime();
39 <        Thread.sleep(1);
40 <        long m2 = System.currentTimeMillis();
41 <        long millis = m2 - m1;
42 <        long nanos = n2 - n1;
43 <        assertTrue(nanos >= 0);
44 <        long nanosAsMillis = nanos / 1000000;
45 <        assertTrue(nanosAsMillis <= millis + MILLIS_ROUND);
46 <    }
47 <
48 <    /**
49 <     * Millis between readings of nanos is less than nanos, adjusting
50 <     * for rounding.
51 <     * This shows only that nano timing not (much) worse than milli.
52 <     */
53 <    public void testNanoTime2() throws InterruptedException {
54 <        long n1 = System.nanoTime();
33 >    public void testNanoTime() throws InterruptedException {
34 >        long m0 = System.currentTimeMillis();
35 >        long n0 = System.nanoTime();
36          Thread.sleep(1);
37          long m1 = System.currentTimeMillis();
38 <        Thread.sleep(SHORT_DELAY_MS);
38 >        long n1 = System.nanoTime();
39 >        Thread.sleep(50);       // avoid possibly scaled SHORT_DELAY_MS
40          long m2 = System.currentTimeMillis();
59        Thread.sleep(1);
41          long n2 = System.nanoTime();
42 <        long millis = m2 - m1;
43 <        long nanos = n2 - n1;
44 <
45 <        assertTrue(nanos >= 0);
46 <        long nanosAsMillis = nanos / 1000000;
66 <        assertTrue(millis <= nanosAsMillis + MILLIS_ROUND);
42 >        Thread.sleep(1);
43 >        long m3 = System.currentTimeMillis();
44 >        long n3 = System.nanoTime();
45 >        assertTrue((n2 - n1) / 1_000_000 <= m3 - m0 + MILLIS_ROUND);
46 >        assertTrue(m2 - m1 <= (n3 - n0) / 1_000_000 + MILLIS_ROUND);
47      }
68
48   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines