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

Comparing jsr166/src/test/tck/ReentrantReadWriteLockTest.java (file contents):
Revision 1.75 by jsr166, Fri Jul 3 00:23:43 2015 UTC vs.
Revision 1.78 by jsr166, Fri Jul 3 05:48:30 2015 UTC

# Line 170 | Line 170 | public class ReentrantReadWriteLockTest
170          case awaitNanos:
171              long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
172              long nanosRemaining = c.awaitNanos(timeoutNanos);
173 <            assertTrue(nanosRemaining > 0);
173 >            assertTrue(nanosRemaining > timeoutNanos / 2);
174              assertTrue(nanosRemaining <= timeoutNanos);
175              break;
176          case awaitUntil:
# Line 969 | Line 969 | public class ReentrantReadWriteLockTest
969                  new ReentrantReadWriteLock(fair);
970              final Condition c = lock.writeLock().newCondition();
971              lock.writeLock().lock();
972 <            long startTime = System.nanoTime();
973 <            long timeoutMillis = 10;
974 <            java.util.Date d = new java.util.Date();
975 <            assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + timeoutMillis)));
976 <            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
972 >            // We shouldn't assume that nanoTime and currentTimeMillis
973 >            // use the same time source, so don't use nanoTime here.
974 >            java.util.Date delayedDate = delayedDate(timeoutMillis());
975 >            assertFalse(c.awaitUntil(delayedDate));
976 >            assertTrue(new java.util.Date().getTime() >= delayedDate.getTime());
977              lock.writeLock().unlock();
978          } catch (InterruptedException fail) { threadUnexpectedException(fail); }
979      }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines