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.31 by jsr166, Sun Oct 22 21:52:58 2017 UTC vs.
Revision 1.36 by jsr166, Mon Dec 16 21:13:07 2019 UTC

# Line 662 | Line 662 | public class ConcurrentLinkedDequeTest e
662       */
663      public void testToArray() {
664          ConcurrentLinkedDeque q = populatedDeque(SIZE);
665 <        Object[] o = q.toArray();
666 <        for (int i = 0; i < o.length; i++)
667 <            assertSame(o[i], q.poll());
665 >        Object[] a = q.toArray();
666 >        assertSame(Object[].class, a.getClass());
667 >        for (Object o : a)
668 >            assertSame(o, q.poll());
669 >        assertTrue(q.isEmpty());
670      }
671  
672      /**
# Line 675 | Line 677 | public class ConcurrentLinkedDequeTest e
677          Integer[] ints = new Integer[SIZE];
678          Integer[] array = q.toArray(ints);
679          assertSame(ints, array);
680 <        for (int i = 0; i < ints.length; i++)
681 <            assertSame(ints[i], q.poll());
680 >        for (Integer o : ints)
681 >            assertSame(o, q.poll());
682 >        assertTrue(q.isEmpty());
683      }
684  
685      /**
# Line 685 | Line 688 | public class ConcurrentLinkedDequeTest e
688      public void testToArray_NullArg() {
689          ConcurrentLinkedDeque q = populatedDeque(SIZE);
690          try {
691 <            q.toArray(null);
691 >            q.toArray((Object[])null);
692              shouldThrow();
693          } catch (NullPointerException success) {}
694      }
# Line 910 | Line 913 | public class ConcurrentLinkedDequeTest e
913      }
914  
915      void runAsync(Runnable r1, Runnable r2) {
916 <        boolean b = ThreadLocalRandom.current().nextBoolean();
916 >        boolean b = randomBoolean();
917          CompletableFuture<Void> f1 = CompletableFuture.runAsync(b ? r1 : r2);
918          CompletableFuture<Void> f2 = CompletableFuture.runAsync(b ? r2 : r1);
919          f1.join();
# Line 973 | Line 976 | public class ConcurrentLinkedDequeTest e
976          }
977      }
978  
976 –    <T> T chooseRandomly(T... choices) {
977 –        return choices[ThreadLocalRandom.current().nextInt(choices.length)];
978 –    }
979 –
979      /**
980       * Non-traversing Deque operations (that return null) are linearizable.
981       * Don't return null when the deque is observably never empty.
# Line 984 | Line 983 | public class ConcurrentLinkedDequeTest e
983       * ant -Djsr166.expensiveTests=true -Djsr166.tckTestClass=ConcurrentLinkedDequeTest -Djsr166.methodFilter=testBug8189387 tck
984       */
985      public void testBug8189387() {
987 –        final ThreadLocalRandom rnd = ThreadLocalRandom.current();
986          Object x = new Object();
987          for (int n = expensiveTests ? 100_000 : 10; n--> 0; ) {
988              ConcurrentLinkedDeque<Object> d = new ConcurrentLinkedDeque<>();

Diff Legend

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