--- jsr166/src/test/tck/LinkedBlockingDequeTest.java	2009/11/22 18:57:17	1.18
+++ jsr166/src/test/tck/LinkedBlockingDequeTest.java	2010/09/29 12:33:48	1.23
@@ -12,7 +12,7 @@ import java.io.*;
 
 public class LinkedBlockingDequeTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run (suite());
+        junit.textui.TestRunner.run(suite());
     }
 
     public static Test suite() {
@@ -157,7 +157,7 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     * getFirst returns next getFirst, or throws NSEE if empty
+     * getFirst() returns first element, or throws NSEE if empty
      */
     public void testFirstElement() {
         LinkedBlockingDeque q = populatedDeque(SIZE);
@@ -173,7 +173,7 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     *  getLast returns next element, or throws NSEE if empty
+     *  getLast() returns last element, or throws NSEE if empty
      */
     public void testLastElement() {
         LinkedBlockingDeque q = populatedDeque(SIZE);
@@ -189,7 +189,7 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     *  removeFirst removes next element, or throws NSEE if empty
+     * removeFirst() removes first element, or throws NSEE if empty
      */
     public void testRemoveFirst() {
         LinkedBlockingDeque q = populatedDeque(SIZE);
@@ -204,7 +204,7 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     *  removeLast removes last element, or throws NSEE if empty
+     * removeLast() removes last element, or throws NSEE if empty
      */
     public void testRemoveLast() {
         LinkedBlockingDeque q = populatedDeque(SIZE);
@@ -269,7 +269,7 @@ public class LinkedBlockingDequeTest ext
         LinkedBlockingDeque q = populatedDeque(3);
         q.pollLast();
         q.addFirst(four);
-        assertEquals(four,q.peekFirst());
+        assertSame(four, q.peekFirst());
     }
 
     /**
@@ -279,7 +279,7 @@ public class LinkedBlockingDequeTest ext
         LinkedBlockingDeque q = populatedDeque(3);
         q.pollLast();
         q.addLast(four);
-        assertEquals(four,q.peekLast());
+        assertSame(four, q.peekLast());
     }
 
 
@@ -437,7 +437,7 @@ public class LinkedBlockingDequeTest ext
         LinkedBlockingDeque q = populatedDeque(3);
         q.pollLast();
         q.push(four);
-        assertEquals(four,q.peekFirst());
+        assertSame(four, q.peekFirst());
     }
 
 
@@ -513,6 +513,7 @@ public class LinkedBlockingDequeTest ext
             shouldThrow();
         } catch (NullPointerException success) {}
     }
+
     /**
      * addAll of a collection with any null elements throws NPE after
      * possibly adding some elements
@@ -527,6 +528,7 @@ public class LinkedBlockingDequeTest ext
             shouldThrow();
         } catch (NullPointerException success) {}
     }
+
     /**
      * addAll throws ISE if not enough room
      */
@@ -767,9 +769,9 @@ public class LinkedBlockingDequeTest ext
         final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
-                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
                 try {
+                    assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
+                    assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
                     q.poll(LONG_DELAY_MS, MILLISECONDS);
                     shouldThrow();
                 } catch (InterruptedException success) {}
@@ -1374,7 +1376,7 @@ public class LinkedBlockingDequeTest ext
     /**
      * iterator.remove removes current element
      */
-    public void testIteratorRemove () {
+    public void testIteratorRemove() {
         final LinkedBlockingDeque q = new LinkedBlockingDeque(3);
         q.add(two);
         q.add(one);
@@ -1385,8 +1387,8 @@ public class LinkedBlockingDequeTest ext
         it.remove();
 
         it = q.iterator();
-        assertEquals(it.next(), one);
-        assertEquals(it.next(), three);
+        assertSame(it.next(), one);
+        assertSame(it.next(), three);
         assertFalse(it.hasNext());
     }
 
@@ -1410,7 +1412,7 @@ public class LinkedBlockingDequeTest ext
     /**
      * Modifications do not cause iterators to fail
      */
-    public void testWeaklyConsistentIteration () {
+    public void testWeaklyConsistentIteration() {
         final LinkedBlockingDeque q = new LinkedBlockingDeque(3);
         q.add(one);
         q.add(two);
@@ -1466,7 +1468,7 @@ public class LinkedBlockingDequeTest ext
     /**
      * descendingIterator.remove removes current element
      */
-    public void testDescendingIteratorRemove () {
+    public void testDescendingIteratorRemove() {
         final LinkedBlockingDeque q = new LinkedBlockingDeque();
         for (int iters = 0; iters < 100; ++iters) {
             q.add(new Integer(3));
@@ -1508,15 +1510,15 @@ public class LinkedBlockingDequeTest ext
         ExecutorService executor = Executors.newFixedThreadPool(2);
         executor.execute(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                threadAssertFalse(q.offer(three));
-                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
-                threadAssertEquals(0, q.remainingCapacity());
+                assertFalse(q.offer(three));
+                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
+                assertEquals(0, q.remainingCapacity());
             }});
 
         executor.execute(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
                 Thread.sleep(SMALL_DELAY_MS);
-                threadAssertEquals(one, q.take());
+                assertSame(one, q.take());
             }});
 
         joinPool(executor);
@@ -1530,9 +1532,9 @@ public class LinkedBlockingDequeTest ext
         ExecutorService executor = Executors.newFixedThreadPool(2);
         executor.execute(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                threadAssertNull(q.poll());
-                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
-                threadAssertTrue(q.isEmpty());
+                assertNull(q.poll());
+                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
+                assertTrue(q.isEmpty());
             }});
 
         executor.execute(new CheckedRunnable() {