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.17 by jsr166, Sun Nov 22 00:17:37 2009 UTC vs.
Revision 1.22 by jsr166, Wed Aug 25 01:44:48 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 98 | Line 98 | public class LinkedBlockingDequeTest ext
98      public void testPollFirst() {
99          LinkedBlockingDeque q = populatedDeque(SIZE);
100          for (int i = 0; i < SIZE; ++i) {
101 <            assertEquals(i, ((Integer)q.pollFirst()).intValue());
101 >            assertEquals(i, q.pollFirst());
102          }
103          assertNull(q.pollFirst());
104      }
# Line 109 | Line 109 | public class LinkedBlockingDequeTest ext
109      public void testPollLast() {
110          LinkedBlockingDeque q = populatedDeque(SIZE);
111          for (int i = SIZE-1; i >= 0; --i) {
112 <            assertEquals(i, ((Integer)q.pollLast()).intValue());
112 >            assertEquals(i, q.pollLast());
113          }
114          assertNull(q.pollLast());
115      }
# Line 120 | Line 120 | public class LinkedBlockingDequeTest ext
120      public void testPeekFirst() {
121          LinkedBlockingDeque q = populatedDeque(SIZE);
122          for (int i = 0; i < SIZE; ++i) {
123 <            assertEquals(i, ((Integer)q.peekFirst()).intValue());
124 <            q.pollFirst();
123 >            assertEquals(i, q.peekFirst());
124 >            assertEquals(i, q.pollFirst());
125              assertTrue(q.peekFirst() == null ||
126 <                       i != ((Integer)q.peekFirst()).intValue());
126 >                       !q.peekFirst().equals(i));
127          }
128          assertNull(q.peekFirst());
129      }
# Line 134 | Line 134 | public class LinkedBlockingDequeTest ext
134      public void testPeek() {
135          LinkedBlockingDeque q = populatedDeque(SIZE);
136          for (int i = 0; i < SIZE; ++i) {
137 <            assertEquals(i, ((Integer)q.peek()).intValue());
138 <            q.pollFirst();
137 >            assertEquals(i, q.peek());
138 >            assertEquals(i, q.pollFirst());
139              assertTrue(q.peek() == null ||
140 <                       i != ((Integer)q.peek()).intValue());
140 >                       !q.peek().equals(i));
141          }
142          assertNull(q.peek());
143      }
# Line 148 | Line 148 | public class LinkedBlockingDequeTest ext
148      public void testPeekLast() {
149          LinkedBlockingDeque q = populatedDeque(SIZE);
150          for (int i = SIZE-1; i >= 0; --i) {
151 <            assertEquals(i, ((Integer)q.peekLast()).intValue());
152 <            q.pollLast();
151 >            assertEquals(i, q.peekLast());
152 >            assertEquals(i, q.pollLast());
153              assertTrue(q.peekLast() == null ||
154 <                       i != ((Integer)q.peekLast()).intValue());
154 >                       !q.peekLast().equals(i));
155          }
156          assertNull(q.peekLast());
157      }
158  
159      /**
160 <     * getFirst returns next getFirst, or throws NSEE if empty
160 >     * getFirst() returns first element, or throws NSEE if empty
161       */
162      public void testFirstElement() {
163          LinkedBlockingDeque q = populatedDeque(SIZE);
164          for (int i = 0; i < SIZE; ++i) {
165 <            assertEquals(i, ((Integer)q.getFirst()).intValue());
166 <            q.pollFirst();
165 >            assertEquals(i, q.getFirst());
166 >            assertEquals(i, q.pollFirst());
167          }
168          try {
169              q.getFirst();
# Line 173 | Line 173 | public class LinkedBlockingDequeTest ext
173      }
174  
175      /**
176 <     *  getLast returns next element, or throws NSEE if empty
176 >     *  getLast() returns last element, or throws NSEE if empty
177       */
178      public void testLastElement() {
179          LinkedBlockingDeque q = populatedDeque(SIZE);
180          for (int i = SIZE-1; i >= 0; --i) {
181 <            assertEquals(i, ((Integer)q.getLast()).intValue());
182 <            q.pollLast();
181 >            assertEquals(i, q.getLast());
182 >            assertEquals(i, q.pollLast());
183          }
184          try {
185              q.getLast();
# Line 189 | Line 189 | public class LinkedBlockingDequeTest ext
189      }
190  
191      /**
192 <     *  removeFirst removes next element, or throws NSEE if empty
192 >     * removeFirst() removes first element, or throws NSEE if empty
193       */
194      public void testRemoveFirst() {
195          LinkedBlockingDeque q = populatedDeque(SIZE);
196          for (int i = 0; i < SIZE; ++i) {
197 <            assertEquals(i, ((Integer)q.removeFirst()).intValue());
197 >            assertEquals(i, q.removeFirst());
198          }
199          try {
200              q.removeFirst();
# Line 204 | Line 204 | public class LinkedBlockingDequeTest ext
204      }
205  
206      /**
207 <     *  removeLast removes last element, or throws NSEE if empty
207 >     * removeLast() removes last element, or throws NSEE if empty
208       */
209      public void testRemoveLast() {
210          LinkedBlockingDeque q = populatedDeque(SIZE);
211          for (int i = SIZE - 1; i >= 0; --i) {
212 <            assertEquals(i, ((Integer)q.removeLast()).intValue());
212 >            assertEquals(i, q.removeLast());
213          }
214          try {
215              q.removeLast();
# Line 224 | Line 224 | public class LinkedBlockingDequeTest ext
224      public void testRemove() {
225          LinkedBlockingDeque q = populatedDeque(SIZE);
226          for (int i = 0; i < SIZE; ++i) {
227 <            assertEquals(i, ((Integer)q.remove()).intValue());
227 >            assertEquals(i, q.remove());
228          }
229          try {
230              q.remove();
# 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 447 | Line 447 | public class LinkedBlockingDequeTest ext
447      public void testPop() {
448          LinkedBlockingDeque q = populatedDeque(SIZE);
449          for (int i = 0; i < SIZE; ++i) {
450 <            assertEquals(i, ((Integer)q.pop()).intValue());
450 >            assertEquals(i, q.pop());
451          }
452          try {
453              q.pop();
# Line 513 | Line 513 | public class LinkedBlockingDequeTest ext
513              shouldThrow();
514          } catch (NullPointerException success) {}
515      }
516 +
517      /**
518       * addAll of a collection with any null elements throws NPE after
519       * possibly adding some elements
# Line 527 | Line 528 | public class LinkedBlockingDequeTest ext
528              shouldThrow();
529          } catch (NullPointerException success) {}
530      }
531 +
532      /**
533       * addAll throws ISE if not enough room
534       */
# Line 660 | Line 662 | public class LinkedBlockingDequeTest ext
662      public void testTake() throws InterruptedException {
663          LinkedBlockingDeque q = populatedDeque(SIZE);
664          for (int i = 0; i < SIZE; ++i) {
665 <            assertEquals(i, ((Integer)q.take()).intValue());
665 >            assertEquals(i, q.take());
666          }
667      }
668  
# Line 688 | Line 690 | public class LinkedBlockingDequeTest ext
690          Thread t = new Thread(new CheckedRunnable() {
691              public void realRun() throws InterruptedException {
692                  for (int i = 0; i < SIZE; ++i) {
693 <                    assertEquals(i, ((Integer)q.take()).intValue());
693 >                    assertEquals(i, q.take());
694                  }
695                  try {
696                      q.take();
# Line 709 | Line 711 | public class LinkedBlockingDequeTest ext
711      public void testPoll() {
712          LinkedBlockingDeque q = populatedDeque(SIZE);
713          for (int i = 0; i < SIZE; ++i) {
714 <            assertEquals(i, ((Integer)q.poll()).intValue());
714 >            assertEquals(i, q.poll());
715          }
716          assertNull(q.poll());
717      }
# Line 720 | Line 722 | public class LinkedBlockingDequeTest ext
722      public void testTimedPoll0() throws InterruptedException {
723          LinkedBlockingDeque q = populatedDeque(SIZE);
724          for (int i = 0; i < SIZE; ++i) {
725 <            assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
725 >            assertEquals(i, q.poll(0, MILLISECONDS));
726          }
727          assertNull(q.poll(0, MILLISECONDS));
728      }
# Line 731 | Line 733 | public class LinkedBlockingDequeTest ext
733      public void testTimedPoll() throws InterruptedException {
734          LinkedBlockingDeque q = populatedDeque(SIZE);
735          for (int i = 0; i < SIZE; ++i) {
736 <            assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
736 >            assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
737          }
738          assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
739      }
# Line 745 | Line 747 | public class LinkedBlockingDequeTest ext
747              public void realRun() throws InterruptedException {
748                  LinkedBlockingDeque q = populatedDeque(SIZE);
749                  for (int i = 0; i < SIZE; ++i) {
750 <                    assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
750 >                    assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
751                  }
752                  try {
753                      q.poll(SMALL_DELAY_MS, MILLISECONDS);
# Line 886 | Line 888 | public class LinkedBlockingDequeTest ext
888      public void testTakeFirst() throws InterruptedException {
889          LinkedBlockingDeque q = populatedDeque(SIZE);
890          for (int i = 0; i < SIZE; ++i) {
891 <            assertEquals(i, ((Integer)q.takeFirst()).intValue());
891 >            assertEquals(i, q.takeFirst());
892          }
893      }
894  
# Line 934 | Line 936 | public class LinkedBlockingDequeTest ext
936      public void testTimedPollFirst0() throws InterruptedException {
937          LinkedBlockingDeque q = populatedDeque(SIZE);
938          for (int i = 0; i < SIZE; ++i) {
939 <            assertEquals(i, ((Integer)q.pollFirst(0, MILLISECONDS)).intValue());
939 >            assertEquals(i, q.pollFirst(0, MILLISECONDS));
940          }
941          assertNull(q.pollFirst(0, MILLISECONDS));
942      }
# Line 945 | Line 947 | public class LinkedBlockingDequeTest ext
947      public void testTimedPollFirst() throws InterruptedException {
948          LinkedBlockingDeque q = populatedDeque(SIZE);
949          for (int i = 0; i < SIZE; ++i) {
950 <            assertEquals(i, ((Integer)q.pollFirst(SHORT_DELAY_MS, MILLISECONDS)).intValue());
950 >            assertEquals(i, q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
951          }
952          assertNull(q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
953      }
# Line 959 | Line 961 | public class LinkedBlockingDequeTest ext
961              public void realRun() throws InterruptedException {
962                  LinkedBlockingDeque q = populatedDeque(SIZE);
963                  for (int i = 0; i < SIZE; ++i) {
964 <                    assertEquals(i, ((Integer)q.pollFirst(SHORT_DELAY_MS, MILLISECONDS)).intValue());
964 >                    assertEquals(i, q.pollFirst(SHORT_DELAY_MS, MILLISECONDS));
965                  }
966                  try {
967                      q.pollFirst(SMALL_DELAY_MS, MILLISECONDS);
# Line 1099 | Line 1101 | public class LinkedBlockingDequeTest ext
1101      public void testTakeLast() throws InterruptedException {
1102          LinkedBlockingDeque q = populatedDeque(SIZE);
1103          for (int i = 0; i < SIZE; ++i) {
1104 <            assertEquals(SIZE-i-1, ((Integer)q.takeLast()).intValue());
1104 >            assertEquals(SIZE-i-1, q.takeLast());
1105          }
1106      }
1107  
# Line 1146 | Line 1148 | public class LinkedBlockingDequeTest ext
1148      public void testTimedPollLast0() throws InterruptedException {
1149          LinkedBlockingDeque q = populatedDeque(SIZE);
1150          for (int i = 0; i < SIZE; ++i) {
1151 <            assertEquals(SIZE-i-1, ((Integer)q.pollLast(0, MILLISECONDS)).intValue());
1151 >            assertEquals(SIZE-i-1, q.pollLast(0, MILLISECONDS));
1152          }
1153          assertNull(q.pollLast(0, MILLISECONDS));
1154      }
# Line 1157 | Line 1159 | public class LinkedBlockingDequeTest ext
1159      public void testTimedPollLast() throws InterruptedException {
1160          LinkedBlockingDeque q = populatedDeque(SIZE);
1161          for (int i = 0; i < SIZE; ++i) {
1162 <            assertEquals(SIZE-i-1, ((Integer)q.pollLast(SHORT_DELAY_MS, MILLISECONDS)).intValue());
1162 >            assertEquals(SIZE-i-1, q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1163          }
1164          assertNull(q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1165      }
# Line 1171 | Line 1173 | public class LinkedBlockingDequeTest ext
1173              public void realRun() throws InterruptedException {
1174                  LinkedBlockingDeque q = populatedDeque(SIZE);
1175                  for (int i = 0; i < SIZE; ++i) {
1176 <                    assertEquals(SIZE-i-1, ((Integer)q.pollLast(SHORT_DELAY_MS, MILLISECONDS)).intValue());
1176 >                    assertEquals(SIZE-i-1, q.pollLast(SHORT_DELAY_MS, MILLISECONDS));
1177                  }
1178                  try {
1179                      q.pollLast(SMALL_DELAY_MS, MILLISECONDS);
# Line 1215 | Line 1217 | public class LinkedBlockingDequeTest ext
1217      public void testElement() {
1218          LinkedBlockingDeque q = populatedDeque(SIZE);
1219          for (int i = 0; i < SIZE; ++i) {
1220 <            assertEquals(i, ((Integer)q.element()).intValue());
1220 >            assertEquals(i, q.element());
1221              q.poll();
1222          }
1223          try {
# Line 1341 | Line 1343 | public class LinkedBlockingDequeTest ext
1343       * toArray(null) throws NPE
1344       */
1345      public void testToArray_BadArg() {
1346 +        LinkedBlockingDeque q = populatedDeque(SIZE);
1347          try {
1345            LinkedBlockingDeque q = populatedDeque(SIZE);
1348              Object o[] = q.toArray(null);
1349              shouldThrow();
1350          } catch (NullPointerException success) {}
# Line 1352 | Line 1354 | public class LinkedBlockingDequeTest ext
1354       * toArray with incompatible array type throws CCE
1355       */
1356      public void testToArray1_BadArg() {
1357 +        LinkedBlockingDeque q = populatedDeque(SIZE);
1358          try {
1359 <            LinkedBlockingDeque q = populatedDeque(SIZE);
1357 <            Object o[] = q.toArray(new String[10] );
1359 >            Object o[] = q.toArray(new String[10]);
1360              shouldThrow();
1361          } catch (ArrayStoreException success) {}
1362      }
# Line 1374 | Line 1376 | public class LinkedBlockingDequeTest ext
1376      /**
1377       * iterator.remove removes current element
1378       */
1379 <    public void testIteratorRemove () {
1379 >    public void testIteratorRemove() {
1380          final LinkedBlockingDeque q = new LinkedBlockingDeque(3);
1381          q.add(two);
1382          q.add(one);
# Line 1385 | Line 1387 | public class LinkedBlockingDequeTest ext
1387          it.remove();
1388  
1389          it = q.iterator();
1390 <        assertEquals(it.next(), one);
1391 <        assertEquals(it.next(), three);
1390 >        assertSame(it.next(), one);
1391 >        assertSame(it.next(), three);
1392          assertFalse(it.hasNext());
1393      }
1394  
# Line 1402 | Line 1404 | public class LinkedBlockingDequeTest ext
1404          assertEquals(0, q.remainingCapacity());
1405          int k = 0;
1406          for (Iterator it = q.iterator(); it.hasNext();) {
1407 <            int i = ((Integer)(it.next())).intValue();
1406 <            assertEquals(++k, i);
1407 >            assertEquals(++k, it.next());
1408          }
1409          assertEquals(3, k);
1410      }
# Line 1411 | Line 1412 | public class LinkedBlockingDequeTest ext
1412      /**
1413       * Modifications do not cause iterators to fail
1414       */
1415 <    public void testWeaklyConsistentIteration () {
1415 >    public void testWeaklyConsistentIteration() {
1416          final LinkedBlockingDeque q = new LinkedBlockingDeque(3);
1417          q.add(one);
1418          q.add(two);
# Line 1454 | Line 1455 | public class LinkedBlockingDequeTest ext
1455              q.add(new Integer(1));
1456              int k = 0;
1457              for (Iterator it = q.descendingIterator(); it.hasNext();) {
1458 <                int i = ((Integer)(it.next())).intValue();
1458 <                assertEquals(++k, i);
1458 >                assertEquals(++k, it.next());
1459              }
1460  
1461              assertEquals(3, k);
# Line 1468 | Line 1468 | public class LinkedBlockingDequeTest ext
1468      /**
1469       * descendingIterator.remove removes current element
1470       */
1471 <    public void testDescendingIteratorRemove () {
1471 >    public void testDescendingIteratorRemove() {
1472          final LinkedBlockingDeque q = new LinkedBlockingDeque();
1473          for (int iters = 0; iters < 100; ++iters) {
1474              q.add(new Integer(3));
# Line 1510 | Line 1510 | public class LinkedBlockingDequeTest ext
1510          ExecutorService executor = Executors.newFixedThreadPool(2);
1511          executor.execute(new CheckedRunnable() {
1512              public void realRun() throws InterruptedException {
1513 <                threadAssertFalse(q.offer(three));
1514 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
1515 <                threadAssertEquals(0, q.remainingCapacity());
1513 >                assertFalse(q.offer(three));
1514 >                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
1515 >                assertEquals(0, q.remainingCapacity());
1516              }});
1517  
1518          executor.execute(new CheckedRunnable() {
1519              public void realRun() throws InterruptedException {
1520                  Thread.sleep(SMALL_DELAY_MS);
1521 <                threadAssertEquals(one, q.take());
1521 >                assertSame(one, q.take());
1522              }});
1523  
1524          joinPool(executor);
# Line 1532 | Line 1532 | public class LinkedBlockingDequeTest ext
1532          ExecutorService executor = Executors.newFixedThreadPool(2);
1533          executor.execute(new CheckedRunnable() {
1534              public void realRun() throws InterruptedException {
1535 <                threadAssertNull(q.poll());
1536 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
1537 <                threadAssertTrue(q.isEmpty());
1535 >                assertNull(q.poll());
1536 >                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
1537 >                assertTrue(q.isEmpty());
1538              }});
1539  
1540          executor.execute(new CheckedRunnable() {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines