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

Comparing jsr166/src/test/tck/ConcurrentLinkedDequeTest.java (file contents):
Revision 1.21 by jsr166, Sat May 23 00:53:08 2015 UTC vs.
Revision 1.25 by jsr166, Wed Jan 4 06:09:58 2017 UTC

# Line 25 | Line 25 | public class ConcurrentLinkedDequeTest e
25      }
26  
27      public static Test suite() {
28 <        return new TestSuite(ConcurrentLinkedDequeTest.class);
28 >        class Implementation implements CollectionImplementation {
29 >            public Class<?> klazz() { return ConcurrentLinkedDeque.class; }
30 >            public Collection emptyCollection() { return new ConcurrentLinkedDeque(); }
31 >            public Object makeElement(int i) { return i; }
32 >            public boolean isConcurrent() { return true; }
33 >            public boolean permitsNulls() { return false; }
34 >        }
35 >        return newTestSuite(ConcurrentLinkedDequeTest.class,
36 >                            CollectionTest.testSuite(new Implementation()));
37      }
38  
39      /**
40       * Returns a new deque of given size containing consecutive
41 <     * Integers 0 ... n.
41 >     * Integers 0 ... n - 1.
42       */
43      private ConcurrentLinkedDeque<Integer> populatedDeque(int n) {
44 <        ConcurrentLinkedDeque<Integer> q = new ConcurrentLinkedDeque<Integer>();
44 >        ConcurrentLinkedDeque<Integer> q = new ConcurrentLinkedDeque<>();
45          assertTrue(q.isEmpty());
46          for (int i = 0; i < n; ++i)
47              assertTrue(q.offer(new Integer(i)));
48          assertFalse(q.isEmpty());
49          assertEquals(n, q.size());
50 +        assertEquals((Integer) 0, q.peekFirst());
51 +        assertEquals((Integer) (n - 1), q.peekLast());
52          return q;
53      }
54  
# Line 439 | Line 449 | public class ConcurrentLinkedDequeTest e
449              assertTrue(q.contains(i));
450              assertTrue(q.remove(i));
451              assertFalse(q.contains(i));
452 <            assertTrue(q.contains(i-1));
452 >            assertTrue(q.contains(i - 1));
453          }
454          for (int i = 0; i < SIZE; i += 2) {
455              assertTrue(q.contains(i));
456              assertTrue(q.remove(i));
457              assertFalse(q.contains(i));
458 <            assertFalse(q.remove(i+1));
459 <            assertFalse(q.contains(i+1));
458 >            assertFalse(q.remove(i + 1));
459 >            assertFalse(q.contains(i + 1));
460          }
461          assertTrue(q.isEmpty());
462      }
# Line 550 | Line 560 | public class ConcurrentLinkedDequeTest e
560          }
561          for (int i = 0; i < SIZE; i += 2) {
562              assertTrue(q.removeFirstOccurrence(new Integer(i)));
563 <            assertFalse(q.removeFirstOccurrence(new Integer(i+1)));
563 >            assertFalse(q.removeFirstOccurrence(new Integer(i + 1)));
564          }
565          assertTrue(q.isEmpty());
566      }
# Line 565 | Line 575 | public class ConcurrentLinkedDequeTest e
575          }
576          for (int i = 0; i < SIZE; i += 2) {
577              assertTrue(q.removeLastOccurrence(new Integer(i)));
578 <            assertFalse(q.removeLastOccurrence(new Integer(i+1)));
578 >            assertFalse(q.removeLastOccurrence(new Integer(i + 1)));
579          }
580          assertTrue(q.isEmpty());
581      }
# Line 753 | Line 763 | public class ConcurrentLinkedDequeTest e
763          final Random rng = new Random();
764          for (int iters = 0; iters < 100; ++iters) {
765              int max = rng.nextInt(5) + 2;
766 <            int split = rng.nextInt(max-1) + 1;
766 >            int split = rng.nextInt(max - 1) + 1;
767              for (int j = 1; j <= max; ++j)
768                  q.add(new Integer(j));
769              Iterator it = q.iterator();
770              for (int j = 1; j <= split; ++j)
771                  assertEquals(it.next(), new Integer(j));
772              it.remove();
773 <            assertEquals(it.next(), new Integer(split+1));
773 >            assertEquals(it.next(), new Integer(split + 1));
774              for (int j = 1; j <= split; ++j)
775                  q.remove(new Integer(j));
776              it = q.iterator();
777 <            for (int j = split+1; j <= max; ++j) {
777 >            for (int j = split + 1; j <= max; ++j) {
778                  assertEquals(it.next(), new Integer(j));
779                  it.remove();
780              }
# Line 821 | Line 831 | public class ConcurrentLinkedDequeTest e
831          final Random rng = new Random();
832          for (int iters = 0; iters < 100; ++iters) {
833              int max = rng.nextInt(5) + 2;
834 <            int split = rng.nextInt(max-1) + 1;
834 >            int split = rng.nextInt(max - 1) + 1;
835              for (int j = max; j >= 1; --j)
836                  q.add(new Integer(j));
837              Iterator it = q.descendingIterator();
838              for (int j = 1; j <= split; ++j)
839                  assertEquals(it.next(), new Integer(j));
840              it.remove();
841 <            assertEquals(it.next(), new Integer(split+1));
841 >            assertEquals(it.next(), new Integer(split + 1));
842              for (int j = 1; j <= split; ++j)
843                  q.remove(new Integer(j));
844              it = q.descendingIterator();
845 <            for (int j = split+1; j <= max; ++j) {
845 >            for (int j = split + 1; j <= max; ++j) {
846                  assertEquals(it.next(), new Integer(j));
847                  it.remove();
848              }

Diff Legend

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