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

Comparing jsr166/src/test/tck/ArrayDequeTest.java (file contents):
Revision 1.37 by jsr166, Sun May 24 01:23:17 2015 UTC vs.
Revision 1.39 by jsr166, Mon Oct 10 14:18:06 2016 UTC

# Line 395 | Line 395 | public class ArrayDequeTest extends JSR1
395              assertTrue(q.contains(i));
396              assertTrue(q.remove(i));
397              assertFalse(q.contains(i));
398 <            assertTrue(q.contains(i-1));
398 >            assertTrue(q.contains(i - 1));
399          }
400          for (int i = 0; i < SIZE; i += 2) {
401              assertTrue(q.contains(i));
402              assertTrue(q.remove(i));
403              assertFalse(q.contains(i));
404 <            assertFalse(q.remove(i+1));
405 <            assertFalse(q.contains(i+1));
404 >            assertFalse(q.remove(i + 1));
405 >            assertFalse(q.contains(i + 1));
406          }
407          assertTrue(q.isEmpty());
408      }
# Line 530 | Line 530 | public class ArrayDequeTest extends JSR1
530       */
531      public void testRemoveFirstOccurrence() {
532          ArrayDeque q = populatedDeque(SIZE);
533 +        assertFalse(q.removeFirstOccurrence(null));
534          for (int i = 1; i < SIZE; i += 2) {
535              assertTrue(q.removeFirstOccurrence(new Integer(i)));
536          }
537          for (int i = 0; i < SIZE; i += 2) {
538              assertTrue(q.removeFirstOccurrence(new Integer(i)));
539 <            assertFalse(q.removeFirstOccurrence(new Integer(i+1)));
539 >            assertFalse(q.removeFirstOccurrence(new Integer(i + 1)));
540          }
541          assertTrue(q.isEmpty());
542 +        assertFalse(q.removeFirstOccurrence(null));
543 +        assertFalse(q.removeFirstOccurrence(42));
544 +        q = new ArrayDeque();
545 +        assertFalse(q.removeFirstOccurrence(null));
546 +        assertFalse(q.removeFirstOccurrence(42));
547      }
548  
549      /**
# Line 545 | Line 551 | public class ArrayDequeTest extends JSR1
551       */
552      public void testRemoveLastOccurrence() {
553          ArrayDeque q = populatedDeque(SIZE);
554 +        assertFalse(q.removeLastOccurrence(null));
555          for (int i = 1; i < SIZE; i += 2) {
556              assertTrue(q.removeLastOccurrence(new Integer(i)));
557          }
558          for (int i = 0; i < SIZE; i += 2) {
559              assertTrue(q.removeLastOccurrence(new Integer(i)));
560 <            assertFalse(q.removeLastOccurrence(new Integer(i+1)));
560 >            assertFalse(q.removeLastOccurrence(new Integer(i + 1)));
561          }
562          assertTrue(q.isEmpty());
563 +        assertFalse(q.removeLastOccurrence(null));
564 +        assertFalse(q.removeLastOccurrence(42));
565 +        q = new ArrayDeque();
566 +        assertFalse(q.removeLastOccurrence(null));
567 +        assertFalse(q.removeLastOccurrence(42));
568      }
569  
570      /**
# Line 781 | Line 793 | public class ArrayDequeTest extends JSR1
793          final Random rng = new Random();
794          for (int iters = 0; iters < 100; ++iters) {
795              int max = rng.nextInt(5) + 2;
796 <            int split = rng.nextInt(max-1) + 1;
796 >            int split = rng.nextInt(max - 1) + 1;
797              for (int j = 1; j <= max; ++j)
798                  q.add(new Integer(j));
799              Iterator it = q.iterator();
800              for (int j = 1; j <= split; ++j)
801                  assertEquals(it.next(), new Integer(j));
802              it.remove();
803 <            assertEquals(it.next(), new Integer(split+1));
803 >            assertEquals(it.next(), new Integer(split + 1));
804              for (int j = 1; j <= split; ++j)
805                  q.remove(new Integer(j));
806              it = q.iterator();
807 <            for (int j = split+1; j <= max; ++j) {
807 >            for (int j = split + 1; j <= max; ++j) {
808                  assertEquals(it.next(), new Integer(j));
809                  it.remove();
810              }
# Line 849 | Line 861 | public class ArrayDequeTest extends JSR1
861          final Random rng = new Random();
862          for (int iters = 0; iters < 100; ++iters) {
863              int max = rng.nextInt(5) + 2;
864 <            int split = rng.nextInt(max-1) + 1;
864 >            int split = rng.nextInt(max - 1) + 1;
865              for (int j = max; j >= 1; --j)
866                  q.add(new Integer(j));
867              Iterator it = q.descendingIterator();
868              for (int j = 1; j <= split; ++j)
869                  assertEquals(it.next(), new Integer(j));
870              it.remove();
871 <            assertEquals(it.next(), new Integer(split+1));
871 >            assertEquals(it.next(), new Integer(split + 1));
872              for (int j = 1; j <= split; ++j)
873                  q.remove(new Integer(j));
874              it = q.descendingIterator();
875 <            for (int j = split+1; j <= max; ++j) {
875 >            for (int j = split + 1; j <= max; ++j) {
876                  assertEquals(it.next(), new Integer(j));
877                  it.remove();
878              }

Diff Legend

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