test/jdk/java/util/PriorityQueue/AddNonComparable.java

8207003: Miscellaneous changes imported from jsr166 CVS 2018-09
Reviewed-by: martin, chegar

*** 40,49 ****
--- 40,50 ----
  import java.util.concurrent.PriorityBlockingQueue;
  import java.util.function.BiConsumer;
  import java.util.function.Supplier;
  
  import static org.testng.Assert.assertEquals;
+ import static org.testng.Assert.assertNull;
  import static org.testng.Assert.assertTrue;
  
  public class AddNonComparable {
  
      static <E> void test(Queue<E> queue, Supplier<E> supplier,
*** 62,83 ****
                   assertTrue(e instanceof ClassCastException);
               });
          test(new PriorityQueue<>(), AComparable::new,
               (q, e) -> {
                   assertEquals(q.size(), 1);
!                  assertTrue(e == null);
               });
  
          test(new PriorityBlockingQueue<>(), NonComparable::new,
               (q, e) -> {
                   assertEquals(q.size(), 0);
                   assertTrue(e instanceof ClassCastException);
               });
          test(new PriorityBlockingQueue<>(), AComparable::new,
               (q, e) -> {
                   assertEquals(q.size(), 1);
!                  assertTrue(e == null);
               });
      }
  
      static <E> void test(SortedSet<E> set, Supplier<E> supplier,
                           BiConsumer<? super SortedSet<E>, Throwable> checker) {
--- 63,84 ----
                   assertTrue(e instanceof ClassCastException);
               });
          test(new PriorityQueue<>(), AComparable::new,
               (q, e) -> {
                   assertEquals(q.size(), 1);
!                  assertNull(e);
               });
  
          test(new PriorityBlockingQueue<>(), NonComparable::new,
               (q, e) -> {
                   assertEquals(q.size(), 0);
                   assertTrue(e instanceof ClassCastException);
               });
          test(new PriorityBlockingQueue<>(), AComparable::new,
               (q, e) -> {
                   assertEquals(q.size(), 1);
!                  assertNull(e);
               });
      }
  
      static <E> void test(SortedSet<E> set, Supplier<E> supplier,
                           BiConsumer<? super SortedSet<E>, Throwable> checker) {
*** 96,117 ****
                   assertTrue(e instanceof ClassCastException);
               });
          test(new TreeSet<>(), AComparable::new,
               (s, e) -> {
                   assertEquals(s.size(), 1);
!                  assertTrue(e == null);
               });
  
          test(new ConcurrentSkipListSet<>(), NonComparable::new,
               (s, e) -> {
                   assertEquals(s.size(), 0);
                   assertTrue(e instanceof ClassCastException);
               });
          test(new ConcurrentSkipListSet<>(), AComparable::new,
               (s, e) -> {
                   assertEquals(s.size(), 1);
!                  assertTrue(e == null);
               });
      }
  
      static <K> void test(SortedMap<K,Boolean> map, Supplier<K> supplier,
                           BiConsumer<? super SortedMap<K,Boolean>, Throwable> checker) {
--- 97,118 ----
                   assertTrue(e instanceof ClassCastException);
               });
          test(new TreeSet<>(), AComparable::new,
               (s, e) -> {
                   assertEquals(s.size(), 1);
!                  assertNull(e);
               });
  
          test(new ConcurrentSkipListSet<>(), NonComparable::new,
               (s, e) -> {
                   assertEquals(s.size(), 0);
                   assertTrue(e instanceof ClassCastException);
               });
          test(new ConcurrentSkipListSet<>(), AComparable::new,
               (s, e) -> {
                   assertEquals(s.size(), 1);
!                  assertNull(e);
               });
      }
  
      static <K> void test(SortedMap<K,Boolean> map, Supplier<K> supplier,
                           BiConsumer<? super SortedMap<K,Boolean>, Throwable> checker) {
*** 129,150 ****
                   assertTrue(e instanceof ClassCastException);
               });
          test(new TreeMap<>(), AComparable::new,
               (m, e) -> {
                   assertEquals(m.size(), 1);
!                  assertTrue(e == null);
               });
  
          test(new ConcurrentSkipListMap<>(), NonComparable::new,
               (s, e) -> {
                   assertEquals(s.size(), 0);
                   assertTrue(e instanceof ClassCastException);
               });
          test(new ConcurrentSkipListMap<>(), AComparable::new,
               (s, e) -> {
                   assertEquals(s.size(), 1);
!                  assertTrue(e == null);
               });
      }
  
      static class NonComparable { }
  
--- 130,151 ----
                   assertTrue(e instanceof ClassCastException);
               });
          test(new TreeMap<>(), AComparable::new,
               (m, e) -> {
                   assertEquals(m.size(), 1);
!                  assertNull(e);
               });
  
          test(new ConcurrentSkipListMap<>(), NonComparable::new,
               (s, e) -> {
                   assertEquals(s.size(), 0);
                   assertTrue(e instanceof ClassCastException);
               });
          test(new ConcurrentSkipListMap<>(), AComparable::new,
               (s, e) -> {
                   assertEquals(s.size(), 1);
!                  assertNull(e);
               });
      }
  
      static class NonComparable { }