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.5 by dl, Sat Dec 27 19:26:44 2003 UTC vs.
Revision 1.6 by dl, Thu Jan 15 14:51:33 2004 UTC

# Line 17 | Line 17 | public class SystemTest extends JSR166Te
17          return new TestSuite(SystemTest.class);
18      }
19  
20 +    /**
21 +     * Worst case rounding for millisecs; set for 60 cycle millis clock.
22 +     * This value might need to be changed os JVMs with coarser
23 +     *  System.currentTimeMillis clocks.
24 +     */
25 +    static final long MILLIS_ROUND = 17;
26 +
27      /**
28       * Nanos between readings of millis is no longer than millis (plus
29 <     * one milli to allow for rounding).
29 >     * possible rounding).
30       * This shows only that nano timing not (much) worse than milli.
31       */
32      public void testNanoTime1() {
# Line 33 | Line 40 | public class SystemTest extends JSR166Te
40              long m2 = System.currentTimeMillis();
41              long millis = m2 - m1;
42              long nanos = n2 - n1;
36            
43              assertTrue(nanos >= 0);
44 <            assertTrue(nanos < (millis+1) * 1000000);
44 >            long nanosAsMillis = nanos / 1000000;
45 >            assertTrue(nanosAsMillis <= millis + MILLIS_ROUND);
46          }
47          catch(InterruptedException ie) {
48              unexpectedException();
# Line 43 | Line 50 | public class SystemTest extends JSR166Te
50      }
51  
52      /**
53 <     * Millis between readings of nanos is no longer than nanos
53 >     * Millis between readings of nanos is less than nanos, adjusting
54 >     * for rounding.
55       * This shows only that nano timing not (much) worse than milli.
56       */
57      public void testNanoTime2() {
# Line 59 | Line 67 | public class SystemTest extends JSR166Te
67              long nanos = n2 - n1;
68              
69              assertTrue(nanos >= 0);
70 <            assertTrue(millis * 1000000 <= nanos);
70 >            long nanosAsMillis = nanos / 1000000;
71 >            assertTrue(millis <= nanosAsMillis + MILLIS_ROUND);
72          }
73          catch(InterruptedException ie) {
74              unexpectedException();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines