diff options
| author | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2016-03-11 15:59:10 +0000 |
|---|---|---|
| committer | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2016-03-14 15:40:14 +0000 |
| commit | 5328e07d282bef36ac8b757bbee16a761415b2c4 (patch) | |
| tree | d7fd9980442e0d647e1454f54f3d037f4b2280e7 /jsr166-tests/src/test/java/jsr166/BlockingQueueTest.java | |
| parent | 8d28fc1d531b4b39def9598de89311aff112f955 (diff) | |
JSR-166 update
Adapted from sources taken from CVS using:
cvs -d ':pserver:anonymous@gee.cs.oswego.edu/home/jsr166/jsr166' checkout -D "03/03/2016 10:00:00 GMT" jsr166
Bug: 27426599
Change-Id: Ic9ba278929f8747d58b69e7d67ec325064588bff
Diffstat (limited to 'jsr166-tests/src/test/java/jsr166/BlockingQueueTest.java')
| -rw-r--r-- | jsr166-tests/src/test/java/jsr166/BlockingQueueTest.java | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/jsr166-tests/src/test/java/jsr166/BlockingQueueTest.java b/jsr166-tests/src/test/java/jsr166/BlockingQueueTest.java index db0f03dafa..1a188e161d 100644 --- a/jsr166-tests/src/test/java/jsr166/BlockingQueueTest.java +++ b/jsr166-tests/src/test/java/jsr166/BlockingQueueTest.java @@ -39,9 +39,9 @@ public abstract class BlockingQueueTest extends JSR166TestCase { // android-note: Explicitly instantiated. // // public Test testSuite() { - // // TODO: filter the returned tests using the configuration - // // information provided by the subclass via protected methods. - // return new TestSuite(this.getClass()); + // // TODO: filter the returned tests using the configuration + // // information provided by the subclass via protected methods. + // return new TestSuite(this.getClass()); // } //---------------------------------------------------------------- @@ -239,6 +239,8 @@ public abstract class BlockingQueueTest extends JSR166TestCase { shouldThrow(); } catch (InterruptedException success) {} assertFalse(Thread.interrupted()); + + assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); }}); barrier.await(); @@ -352,20 +354,20 @@ public abstract class BlockingQueueTest extends JSR166TestCase { assertEquals((pass == 0), q.contains(elts[i])); assertEquals((pass == 0), q.remove(elts[i])); assertFalse(q.contains(elts[i])); - assertTrue(q.contains(elts[i-1])); + assertTrue(q.contains(elts[i - 1])); if (i < size - 1) - assertTrue(q.contains(elts[i+1])); + assertTrue(q.contains(elts[i + 1])); } } if (size > 0) assertTrue(q.contains(elts[0])); - for (int i = size-2; i >= 0; i -= 2) { + for (int i = size - 2; i >= 0; i -= 2) { assertTrue(q.contains(elts[i])); - assertFalse(q.contains(elts[i+1])); + assertFalse(q.contains(elts[i + 1])); assertTrue(q.remove(elts[i])); assertFalse(q.contains(elts[i])); - assertFalse(q.remove(elts[i+1])); - assertFalse(q.contains(elts[i+1])); + assertFalse(q.remove(elts[i + 1])); + assertFalse(q.contains(elts[i + 1])); } checkEmpty(q); } |