author | psandoz |
Wed, 04 Sep 2013 09:34:25 +0200 | |
changeset 19806 | dda89341ee2d |
parent 19378 | 0b98a290dd86 |
child 20183 | 584504d38d79 |
permissions | -rw-r--r-- |
19065
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
1 |
/* |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
2 |
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
4 |
* |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
8 |
* |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
13 |
* accompanied this code). |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
14 |
* |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
18 |
* |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
21 |
* questions. |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
22 |
*/ |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
23 |
|
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
24 |
/** |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
25 |
* @test |
19806
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
26 |
* @bug 8020156 8020009 8022326 8012913 |
19065
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
27 |
* @run testng SpliteratorCharacteristics |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
28 |
*/ |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
29 |
|
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
30 |
import org.testng.annotations.Test; |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
31 |
|
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
32 |
import java.util.Arrays; |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
33 |
import java.util.Collection; |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
34 |
import java.util.Comparator; |
19806
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
35 |
import java.util.HashMap; |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
36 |
import java.util.HashSet; |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
37 |
import java.util.LinkedHashMap; |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
38 |
import java.util.LinkedHashSet; |
19378
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
39 |
import java.util.Map; |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
40 |
import java.util.Set; |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
41 |
import java.util.SortedMap; |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
42 |
import java.util.SortedSet; |
19065
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
43 |
import java.util.Spliterator; |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
44 |
import java.util.TreeMap; |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
45 |
import java.util.TreeSet; |
19378
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
46 |
import java.util.concurrent.ConcurrentSkipListMap; |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
47 |
import java.util.concurrent.ConcurrentSkipListSet; |
19065
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
48 |
|
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
49 |
import static org.testng.Assert.*; |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
50 |
|
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
51 |
@Test |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
52 |
public class SpliteratorCharacteristics { |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
53 |
|
19806
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
54 |
public void testHashMap() { |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
55 |
assertMapCharacteristics(new HashMap<>(), |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
56 |
Spliterator.SIZED | Spliterator.DISTINCT); |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
57 |
} |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
58 |
|
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
59 |
public void testHashSet() { |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
60 |
assertSetCharacteristics(new HashSet<>(), |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
61 |
Spliterator.SIZED | Spliterator.DISTINCT); |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
62 |
} |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
63 |
|
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
64 |
public void testLinkedHashMap() { |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
65 |
assertMapCharacteristics(new LinkedHashMap<>(), |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
66 |
Spliterator.SIZED | Spliterator.DISTINCT | |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
67 |
Spliterator.ORDERED); |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
68 |
} |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
69 |
|
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
70 |
public void testLinkedHashSet() { |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
71 |
assertSetCharacteristics(new LinkedHashSet<>(), |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
72 |
Spliterator.SIZED | Spliterator.DISTINCT | |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
73 |
Spliterator.ORDERED); |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
74 |
} |
19065
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
75 |
|
19378
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
76 |
public void testTreeMap() { |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
77 |
assertSortedMapCharacteristics(new TreeMap<>(), |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
78 |
Spliterator.SIZED | Spliterator.DISTINCT | |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
79 |
Spliterator.SORTED | Spliterator.ORDERED); |
19065
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
80 |
} |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
81 |
|
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
82 |
public void testTreeMapWithComparator() { |
19378
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
83 |
assertSortedMapCharacteristics(new TreeMap<>(Comparator.reverseOrder()), |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
84 |
Spliterator.SIZED | Spliterator.DISTINCT | |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
85 |
Spliterator.SORTED | Spliterator.ORDERED); |
19065
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
86 |
} |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
87 |
|
19378
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
88 |
public void testTreeSet() { |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
89 |
assertSortedSetCharacteristics(new TreeSet<>(), |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
90 |
Spliterator.SIZED | Spliterator.DISTINCT | |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
91 |
Spliterator.SORTED | Spliterator.ORDERED); |
19065
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
92 |
} |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
93 |
|
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
94 |
public void testTreeSetWithComparator() { |
19378
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
95 |
assertSortedSetCharacteristics(new TreeSet<>(Comparator.reverseOrder()), |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
96 |
Spliterator.SIZED | Spliterator.DISTINCT | |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
97 |
Spliterator.SORTED | Spliterator.ORDERED); |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
98 |
} |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
99 |
|
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
100 |
public void testConcurrentSkipListMap() { |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
101 |
assertSortedMapCharacteristics(new ConcurrentSkipListMap<>(), |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
102 |
Spliterator.CONCURRENT | Spliterator.NONNULL | |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
103 |
Spliterator.DISTINCT | Spliterator.SORTED | |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
104 |
Spliterator.ORDERED); |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
105 |
} |
19065
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
106 |
|
19378
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
107 |
public void testConcurrentSkipListMapWithComparator() { |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
108 |
assertSortedMapCharacteristics(new ConcurrentSkipListMap<>(Comparator.<Integer>reverseOrder()), |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
109 |
Spliterator.CONCURRENT | Spliterator.NONNULL | |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
110 |
Spliterator.DISTINCT | Spliterator.SORTED | |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
111 |
Spliterator.ORDERED); |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
112 |
} |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
113 |
|
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
114 |
public void testConcurrentSkipListSet() { |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
115 |
assertSortedSetCharacteristics(new ConcurrentSkipListSet<>(), |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
116 |
Spliterator.CONCURRENT | Spliterator.NONNULL | |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
117 |
Spliterator.DISTINCT | Spliterator.SORTED | |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
118 |
Spliterator.ORDERED); |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
119 |
} |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
120 |
|
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
121 |
public void testConcurrentSkipListSetWithComparator() { |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
122 |
assertSortedSetCharacteristics(new ConcurrentSkipListSet<>(Comparator.reverseOrder()), |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
123 |
Spliterator.CONCURRENT | Spliterator.NONNULL | |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
124 |
Spliterator.DISTINCT | Spliterator.SORTED | |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
125 |
Spliterator.ORDERED); |
19065
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
126 |
} |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
127 |
|
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
128 |
|
19378
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
129 |
// |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
130 |
|
19806
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
131 |
|
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
132 |
void assertMapCharacteristics(Map<Integer, String> m, int keyCharacteristics) { |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
133 |
assertMapCharacteristics(m, keyCharacteristics, 0); |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
134 |
} |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
135 |
|
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
136 |
void assertMapCharacteristics(Map<Integer, String> m, int keyCharacteristics, int notValueCharacteristics) { |
19378
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
137 |
initMap(m); |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
138 |
|
19806
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
139 |
assertCharacteristics(m.keySet(), keyCharacteristics); |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
140 |
|
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
141 |
assertCharacteristics(m.values(), |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
142 |
keyCharacteristics & ~(Spliterator.DISTINCT | notValueCharacteristics)); |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
143 |
|
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
144 |
assertCharacteristics(m.entrySet(), keyCharacteristics); |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
145 |
|
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
146 |
if ((keyCharacteristics & Spliterator.SORTED) == 0) { |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
147 |
assertISEComparator(m.keySet()); |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
148 |
assertISEComparator(m.values()); |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
149 |
assertISEComparator(m.entrySet()); |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
150 |
} |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
151 |
} |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
152 |
|
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
153 |
void assertSetCharacteristics(Set<Integer> s, int keyCharacteristics) { |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
154 |
initSet(s); |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
155 |
|
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
156 |
assertCharacteristics(s, keyCharacteristics); |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
157 |
|
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
158 |
if ((keyCharacteristics & Spliterator.SORTED) == 0) { |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
159 |
assertISEComparator(s); |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
160 |
} |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
161 |
} |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
162 |
|
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
163 |
void assertSortedMapCharacteristics(SortedMap<Integer, String> m, int keyCharacteristics) { |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
164 |
assertMapCharacteristics(m, keyCharacteristics, Spliterator.SORTED); |
19378
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
165 |
|
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
166 |
Set<Integer> keys = m.keySet(); |
19806
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
167 |
if (m.comparator() != null) { |
19378
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
168 |
assertNotNullComparator(keys); |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
169 |
} |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
170 |
else { |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
171 |
assertNullComparator(keys); |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
172 |
} |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
173 |
|
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
174 |
assertISEComparator(m.values()); |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
175 |
|
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
176 |
assertNotNullComparator(m.entrySet()); |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
177 |
} |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
178 |
|
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
179 |
void assertSortedSetCharacteristics(SortedSet<Integer> s, int keyCharacteristics) { |
19806
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
180 |
assertSetCharacteristics(s, keyCharacteristics); |
19378
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
181 |
|
19806
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
182 |
if (s.comparator() != null) { |
19378
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
183 |
assertNotNullComparator(s); |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
184 |
} |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
185 |
else { |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
186 |
assertNullComparator(s); |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
187 |
} |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
188 |
} |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
189 |
|
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
190 |
void initMap(Map<Integer, String> m) { |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
191 |
m.put(1, "4"); |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
192 |
m.put(2, "3"); |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
193 |
m.put(3, "2"); |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
194 |
m.put(4, "1"); |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
195 |
} |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
196 |
|
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
197 |
void initSet(Set<Integer> s) { |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
198 |
s.addAll(Arrays.asList(1, 2, 3, 4)); |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
199 |
} |
0b98a290dd86
8022326: Spliterator for values of j.u.c.ConcurrentSkipListMap does not report ORDERED
psandoz
parents:
19065
diff
changeset
|
200 |
|
19065
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
201 |
void assertCharacteristics(Collection<?> c, int expectedCharacteristics) { |
19806
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
202 |
assertTrue(c.spliterator().hasCharacteristics(expectedCharacteristics), |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
203 |
"Spliterator characteristics"); |
19065
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
204 |
} |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
205 |
|
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
206 |
void assertNullComparator(Collection<?> c) { |
19806
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
207 |
assertNull(c.spliterator().getComparator(), |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
208 |
"Comparator of Spliterator of Collection"); |
19065
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
209 |
} |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
210 |
|
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
211 |
void assertNotNullComparator(Collection<?> c) { |
19806
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
212 |
assertNotNull(c.spliterator().getComparator(), |
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
213 |
"Comparator of Spliterator of Collection"); |
19065
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
214 |
} |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
215 |
|
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
216 |
void assertISEComparator(Collection<?> c) { |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
217 |
assertISEComparator(c.spliterator()); |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
218 |
} |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
219 |
|
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
220 |
void assertISEComparator(Spliterator<?> s) { |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
221 |
boolean caught = false; |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
222 |
try { |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
223 |
s.getComparator(); |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
224 |
} |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
225 |
catch (IllegalStateException e) { |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
226 |
caught = true; |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
227 |
} |
19806
dda89341ee2d
8023463: Improvements to HashMap/LinkedHashMap use of bins/buckets and trees (red/black)
psandoz
parents:
19378
diff
changeset
|
228 |
assertTrue(caught, "Throwing IllegalStateException"); |
19065
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
229 |
} |
f7c941aa63ee
8020156: TreeMap.values().spliterator() does not report ORDERED
psandoz
parents:
diff
changeset
|
230 |
} |