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

Comparing jsr166/src/test/tck/LinkedBlockingDequeTest.java (file contents):
Revision 1.18 by jsr166, Sun Nov 22 18:57:17 2009 UTC vs.
Revision 1.21 by jsr166, Wed Aug 25 00:07:03 2010 UTC

# Line 12 | Line 12 | import java.io.*;
12  
13   public class LinkedBlockingDequeTest extends JSR166TestCase {
14      public static void main(String[] args) {
15 <        junit.textui.TestRunner.run (suite());
15 >        junit.textui.TestRunner.run(suite());
16      }
17  
18      public static Test suite() {
# Line 269 | Line 269 | public class LinkedBlockingDequeTest ext
269          LinkedBlockingDeque q = populatedDeque(3);
270          q.pollLast();
271          q.addFirst(four);
272 <        assertEquals(four,q.peekFirst());
272 >        assertSame(four, q.peekFirst());
273      }
274  
275      /**
# Line 279 | Line 279 | public class LinkedBlockingDequeTest ext
279          LinkedBlockingDeque q = populatedDeque(3);
280          q.pollLast();
281          q.addLast(four);
282 <        assertEquals(four,q.peekLast());
282 >        assertSame(four, q.peekLast());
283      }
284  
285  
# Line 437 | Line 437 | public class LinkedBlockingDequeTest ext
437          LinkedBlockingDeque q = populatedDeque(3);
438          q.pollLast();
439          q.push(four);
440 <        assertEquals(four,q.peekFirst());
440 >        assertSame(four, q.peekFirst());
441      }
442  
443  
# Line 1374 | Line 1374 | public class LinkedBlockingDequeTest ext
1374      /**
1375       * iterator.remove removes current element
1376       */
1377 <    public void testIteratorRemove () {
1377 >    public void testIteratorRemove() {
1378          final LinkedBlockingDeque q = new LinkedBlockingDeque(3);
1379          q.add(two);
1380          q.add(one);
# Line 1385 | Line 1385 | public class LinkedBlockingDequeTest ext
1385          it.remove();
1386  
1387          it = q.iterator();
1388 <        assertEquals(it.next(), one);
1389 <        assertEquals(it.next(), three);
1388 >        assertSame(it.next(), one);
1389 >        assertSame(it.next(), three);
1390          assertFalse(it.hasNext());
1391      }
1392  
# Line 1410 | Line 1410 | public class LinkedBlockingDequeTest ext
1410      /**
1411       * Modifications do not cause iterators to fail
1412       */
1413 <    public void testWeaklyConsistentIteration () {
1413 >    public void testWeaklyConsistentIteration() {
1414          final LinkedBlockingDeque q = new LinkedBlockingDeque(3);
1415          q.add(one);
1416          q.add(two);
# Line 1466 | Line 1466 | public class LinkedBlockingDequeTest ext
1466      /**
1467       * descendingIterator.remove removes current element
1468       */
1469 <    public void testDescendingIteratorRemove () {
1469 >    public void testDescendingIteratorRemove() {
1470          final LinkedBlockingDeque q = new LinkedBlockingDeque();
1471          for (int iters = 0; iters < 100; ++iters) {
1472              q.add(new Integer(3));
# Line 1508 | Line 1508 | public class LinkedBlockingDequeTest ext
1508          ExecutorService executor = Executors.newFixedThreadPool(2);
1509          executor.execute(new CheckedRunnable() {
1510              public void realRun() throws InterruptedException {
1511 <                threadAssertFalse(q.offer(three));
1512 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
1513 <                threadAssertEquals(0, q.remainingCapacity());
1511 >                assertFalse(q.offer(three));
1512 >                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
1513 >                assertEquals(0, q.remainingCapacity());
1514              }});
1515  
1516          executor.execute(new CheckedRunnable() {
1517              public void realRun() throws InterruptedException {
1518                  Thread.sleep(SMALL_DELAY_MS);
1519 <                threadAssertEquals(one, q.take());
1519 >                assertSame(one, q.take());
1520              }});
1521  
1522          joinPool(executor);
# Line 1530 | Line 1530 | public class LinkedBlockingDequeTest ext
1530          ExecutorService executor = Executors.newFixedThreadPool(2);
1531          executor.execute(new CheckedRunnable() {
1532              public void realRun() throws InterruptedException {
1533 <                threadAssertNull(q.poll());
1534 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
1535 <                threadAssertTrue(q.isEmpty());
1533 >                assertNull(q.poll());
1534 >                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
1535 >                assertTrue(q.isEmpty());
1536              }});
1537  
1538          executor.execute(new CheckedRunnable() {

Diff Legend

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