test/jdk/java/util/Spliterator/SpliteratorCharacteristics.java

*** 1,7 ***
  /*
!  * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ---
  /*
!  * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 21,11 ***
   * questions.
   */
  
  /**
   * @test
!  * @bug 8020156 8020009 8022326 8012913 8024405 8024408 8071477
   * @run testng SpliteratorCharacteristics
   */
  
  import org.testng.annotations.Test;
  
--- 21,11 ---
   * questions.
   */
  
  /**
   * @test
!  * @bug 8020156 8020009 8022326 8012913 8024405 8024408 8071477 8336672
   * @run testng SpliteratorCharacteristics
   */
  
  import org.testng.annotations.Test;
  

*** 109,11 ***
              assertHasNotCharacteristics(s, Spliterator.CONCURRENT);
          }
      }
  
      public void testSpliteratorFromCollection() {
!         List<Integer> l = Arrays.asList(1, 2, 3, 4);
  
          {
              Spliterator<?> s = Spliterators.spliterator(l, 0);
              assertCharacteristics(s, Spliterator.SIZED | Spliterator.SUBSIZED);
              assertHasNotCharacteristics(s, Spliterator.CONCURRENT);
--- 109,11 ---
              assertHasNotCharacteristics(s, Spliterator.CONCURRENT);
          }
      }
  
      public void testSpliteratorFromCollection() {
!         List<String> l = Arrays.asList("A", "B", "C", "D");
  
          {
              Spliterator<?> s = Spliterators.spliterator(l, 0);
              assertCharacteristics(s, Spliterator.SIZED | Spliterator.SUBSIZED);
              assertHasNotCharacteristics(s, Spliterator.CONCURRENT);

*** 289,11 ***
                                         Spliterator.DISTINCT | Spliterator.SORTED |
                                         Spliterator.ORDERED);
      }
  
      public void testConcurrentSkipListMapWithComparator() {
!         assertSortedMapCharacteristics(new ConcurrentSkipListMap<>(Comparator.<Integer>reverseOrder()),
                                         Spliterator.CONCURRENT | Spliterator.NONNULL |
                                         Spliterator.DISTINCT | Spliterator.SORTED |
                                         Spliterator.ORDERED);
      }
  
--- 289,11 ---
                                         Spliterator.DISTINCT | Spliterator.SORTED |
                                         Spliterator.ORDERED);
      }
  
      public void testConcurrentSkipListMapWithComparator() {
!         assertSortedMapCharacteristics(new ConcurrentSkipListMap<>(Comparator.<String>reverseOrder()),
                                         Spliterator.CONCURRENT | Spliterator.NONNULL |
                                         Spliterator.DISTINCT | Spliterator.SORTED |
                                         Spliterator.ORDERED);
      }
  

*** 313,15 ***
  
  
      //
  
  
!     void assertMapCharacteristics(Map<Integer, String> m, int keyCharacteristics) {
          assertMapCharacteristics(m, keyCharacteristics, 0);
      }
  
!     void assertMapCharacteristics(Map<Integer, String> m, int keyCharacteristics, int notValueCharacteristics) {
          initMap(m);
  
          assertCharacteristics(m.keySet(), keyCharacteristics);
  
          assertCharacteristics(m.values(),
--- 313,15 ---
  
  
      //
  
  
!     void assertMapCharacteristics(Map<String, String> m, int keyCharacteristics) {
          assertMapCharacteristics(m, keyCharacteristics, 0);
      }
  
!     void assertMapCharacteristics(Map<String, String> m, int keyCharacteristics, int notValueCharacteristics) {
          initMap(m);
  
          assertCharacteristics(m.keySet(), keyCharacteristics);
  
          assertCharacteristics(m.values(),

*** 334,24 ***
              assertISEComparator(m.values());
              assertISEComparator(m.entrySet());
          }
      }
  
!     void assertSetCharacteristics(Set<Integer> s, int keyCharacteristics) {
          initSet(s);
  
          assertCharacteristics(s, keyCharacteristics);
  
          if ((keyCharacteristics & Spliterator.SORTED) == 0) {
              assertISEComparator(s);
          }
      }
  
!     void assertSortedMapCharacteristics(SortedMap<Integer, String> m, int keyCharacteristics) {
          assertMapCharacteristics(m, keyCharacteristics, Spliterator.SORTED);
  
!         Set<Integer> keys = m.keySet();
          if (m.comparator() != null) {
              assertNotNullComparator(keys);
          }
          else {
              assertNullComparator(keys);
--- 334,24 ---
              assertISEComparator(m.values());
              assertISEComparator(m.entrySet());
          }
      }
  
!     void assertSetCharacteristics(Set<String> s, int keyCharacteristics) {
          initSet(s);
  
          assertCharacteristics(s, keyCharacteristics);
  
          if ((keyCharacteristics & Spliterator.SORTED) == 0) {
              assertISEComparator(s);
          }
      }
  
!     void assertSortedMapCharacteristics(SortedMap<String, String> m, int keyCharacteristics) {
          assertMapCharacteristics(m, keyCharacteristics, Spliterator.SORTED);
  
!         Set<String> keys = m.keySet();
          if (m.comparator() != null) {
              assertNotNullComparator(keys);
          }
          else {
              assertNullComparator(keys);

*** 360,30 ***
          assertISEComparator(m.values());
  
          assertNotNullComparator(m.entrySet());
      }
  
!     void assertSortedSetCharacteristics(SortedSet<Integer> s, int keyCharacteristics) {
          assertSetCharacteristics(s, keyCharacteristics);
  
          if (s.comparator() != null) {
              assertNotNullComparator(s);
          }
          else {
              assertNullComparator(s);
          }
      }
  
!     void initMap(Map<Integer, String> m) {
!         m.put(1, "4");
!         m.put(2, "3");
!         m.put(3, "2");
!         m.put(4, "1");
      }
  
!     void initSet(Set<Integer> s) {
!         s.addAll(Arrays.asList(1, 2, 3, 4));
      }
  
      void assertCharacteristics(Collection<?> c, int expectedCharacteristics) {
          assertCharacteristics(c.spliterator(), expectedCharacteristics);
      }
--- 360,30 ---
          assertISEComparator(m.values());
  
          assertNotNullComparator(m.entrySet());
      }
  
!     void assertSortedSetCharacteristics(SortedSet<String> s, int keyCharacteristics) {
          assertSetCharacteristics(s, keyCharacteristics);
  
          if (s.comparator() != null) {
              assertNotNullComparator(s);
          }
          else {
              assertNullComparator(s);
          }
      }
  
!     void initMap(Map<String, String> m) {
!         m.put("A", "4");
!         m.put("B", "3");
!         m.put("C", "2");
!         m.put("D", "1");
      }
  
!     void initSet(Set<String> s) {
!         s.addAll(Arrays.asList("A", "B", "C", "D"));
      }
  
      void assertCharacteristics(Collection<?> c, int expectedCharacteristics) {
          assertCharacteristics(c.spliterator(), expectedCharacteristics);
      }