diff options
Diffstat (limited to 'jsr166-tests/src/test/java/jsr166/ConcurrentLinkedQueueTest.java')
| -rw-r--r-- | jsr166-tests/src/test/java/jsr166/ConcurrentLinkedQueueTest.java | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/jsr166-tests/src/test/java/jsr166/ConcurrentLinkedQueueTest.java b/jsr166-tests/src/test/java/jsr166/ConcurrentLinkedQueueTest.java index d3f5b1f83b..70519a4c14 100644 --- a/jsr166-tests/src/test/java/jsr166/ConcurrentLinkedQueueTest.java +++ b/jsr166-tests/src/test/java/jsr166/ConcurrentLinkedQueueTest.java @@ -27,7 +27,7 @@ public class ConcurrentLinkedQueueTest extends JSR166TestCase { // main(suite(), args); // } // public static Test suite() { - // return new TestSuite(...); + // return new TestSuite(ConcurrentLinkedQueueTest.class); // } /** @@ -66,8 +66,7 @@ public class ConcurrentLinkedQueueTest extends JSR166TestCase { */ public void testConstructor4() { try { - Integer[] ints = new Integer[SIZE]; - new ConcurrentLinkedQueue(Arrays.asList(ints)); + new ConcurrentLinkedQueue(Arrays.asList(new Integer[SIZE])); shouldThrow(); } catch (NullPointerException success) {} } @@ -76,10 +75,10 @@ public class ConcurrentLinkedQueueTest extends JSR166TestCase { * Initializing from Collection with some null elements throws NPE */ public void testConstructor5() { + Integer[] ints = new Integer[SIZE]; + for (int i = 0; i < SIZE - 1; ++i) + ints[i] = new Integer(i); try { - Integer[] ints = new Integer[SIZE]; - for (int i = 0; i < SIZE-1; ++i) - ints[i] = new Integer(i); new ConcurrentLinkedQueue(Arrays.asList(ints)); shouldThrow(); } catch (NullPointerException success) {} @@ -117,7 +116,7 @@ public class ConcurrentLinkedQueueTest extends JSR166TestCase { public void testSize() { ConcurrentLinkedQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(SIZE-i, q.size()); + assertEquals(SIZE - i, q.size()); q.remove(); } for (int i = 0; i < SIZE; ++i) { @@ -130,8 +129,8 @@ public class ConcurrentLinkedQueueTest extends JSR166TestCase { * offer(null) throws NPE */ public void testOfferNull() { + ConcurrentLinkedQueue q = new ConcurrentLinkedQueue(); try { - ConcurrentLinkedQueue q = new ConcurrentLinkedQueue(); q.offer(null); shouldThrow(); } catch (NullPointerException success) {} @@ -141,8 +140,8 @@ public class ConcurrentLinkedQueueTest extends JSR166TestCase { * add(null) throws NPE */ public void testAddNull() { + ConcurrentLinkedQueue q = new ConcurrentLinkedQueue(); try { - ConcurrentLinkedQueue q = new ConcurrentLinkedQueue(); q.add(null); shouldThrow(); } catch (NullPointerException success) {} @@ -172,8 +171,8 @@ public class ConcurrentLinkedQueueTest extends JSR166TestCase { * addAll(null) throws NPE */ public void testAddAll1() { + ConcurrentLinkedQueue q = new ConcurrentLinkedQueue(); try { - ConcurrentLinkedQueue q = new ConcurrentLinkedQueue(); q.addAll(null); shouldThrow(); } catch (NullPointerException success) {} @@ -183,8 +182,8 @@ public class ConcurrentLinkedQueueTest extends JSR166TestCase { * addAll(this) throws IAE */ public void testAddAllSelf() { + ConcurrentLinkedQueue q = populatedQueue(SIZE); try { - ConcurrentLinkedQueue q = populatedQueue(SIZE); q.addAll(q); shouldThrow(); } catch (IllegalArgumentException success) {} @@ -194,10 +193,9 @@ public class ConcurrentLinkedQueueTest extends JSR166TestCase { * addAll of a collection with null elements throws NPE */ public void testAddAll2() { + ConcurrentLinkedQueue q = new ConcurrentLinkedQueue(); try { - ConcurrentLinkedQueue q = new ConcurrentLinkedQueue(); - Integer[] ints = new Integer[SIZE]; - q.addAll(Arrays.asList(ints)); + q.addAll(Arrays.asList(new Integer[SIZE])); shouldThrow(); } catch (NullPointerException success) {} } @@ -207,11 +205,11 @@ public class ConcurrentLinkedQueueTest extends JSR166TestCase { * possibly adding some elements */ public void testAddAll3() { + ConcurrentLinkedQueue q = new ConcurrentLinkedQueue(); + Integer[] ints = new Integer[SIZE]; + for (int i = 0; i < SIZE - 1; ++i) + ints[i] = new Integer(i); try { - ConcurrentLinkedQueue q = new ConcurrentLinkedQueue(); - Integer[] ints = new Integer[SIZE]; - for (int i = 0; i < SIZE-1; ++i) - ints[i] = new Integer(i); q.addAll(Arrays.asList(ints)); shouldThrow(); } catch (NullPointerException success) {} @@ -295,14 +293,14 @@ public class ConcurrentLinkedQueueTest extends JSR166TestCase { assertTrue(q.contains(i)); assertTrue(q.remove(i)); assertFalse(q.contains(i)); - assertTrue(q.contains(i-1)); + assertTrue(q.contains(i - 1)); } for (int i = 0; i < SIZE; i += 2) { assertTrue(q.contains(i)); assertTrue(q.remove(i)); assertFalse(q.contains(i)); - assertFalse(q.remove(i+1)); - assertFalse(q.contains(i+1)); + assertFalse(q.remove(i + 1)); + assertFalse(q.contains(i + 1)); } assertTrue(q.isEmpty()); } @@ -361,7 +359,7 @@ public class ConcurrentLinkedQueueTest extends JSR166TestCase { assertTrue(changed); assertTrue(q.containsAll(p)); - assertEquals(SIZE-i, q.size()); + assertEquals(SIZE - i, q.size()); p.remove(); } } @@ -374,7 +372,7 @@ public class ConcurrentLinkedQueueTest extends JSR166TestCase { ConcurrentLinkedQueue q = populatedQueue(SIZE); ConcurrentLinkedQueue p = populatedQueue(i); assertTrue(q.removeAll(p)); - assertEquals(SIZE-i, q.size()); + assertEquals(SIZE - i, q.size()); for (int j = 0; j < i; ++j) { Integer x = (Integer)(p.remove()); assertFalse(q.contains(x)); |