Mercurial > hg > openjdk > lambda > jdk

changeset 9551:190f250c7163

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add RandomAccessList and Navigable to Wrappers test for Collections
author henryjen
date Wed, 21 Aug 2013 15:52:32 -0700
parents c30b320faa97
children 99012c58e718
files test/java/util/Collections/Wrappers.java
diffstat 1 files changed, 14 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/test/java/util/Collections/Wrappers.java	Wed Aug 21 17:00:38 2013 +0200
+++ b/test/java/util/Collections/Wrappers.java	Wed Aug 21 15:52:32 2013 -0700
@@ -54,19 +54,23 @@
 
         List<Object[]> cases = new ArrayList<>();
         LinkedList<Integer> seedList = new LinkedList<>();
+        ArrayList<Integer> seedRandomAccess = new ArrayList<>();
         TreeSet<Integer> seedSet = new TreeSet<>();
         TreeMap<Integer, Integer> seedMap = new TreeMap<>();
 
         for (int i = 1; i <= 10; i++) {
             seedList.add(i);
+            seedRandomAccess.add(i);
             seedSet.add(i);
             seedMap.put(i, i);
         }
 
         cases.add(new Object[] { Collections.unmodifiableCollection(seedList) });
         cases.add(new Object[] { Collections.unmodifiableList(seedList) });
+        cases.add(new Object[] { Collections.unmodifiableList(seedRandomAccess) });
         cases.add(new Object[] { Collections.unmodifiableSet(seedSet) });
         cases.add(new Object[] { Collections.unmodifiableSortedSet(seedSet) });
+        cases.add(new Object[] { Collections.unmodifiableNavigableSet(seedSet) });
 
         // As sets from map also need to be unmodifiable, thus a wrapping
         // layer exist and should not have default methods
@@ -76,12 +80,17 @@
         cases.add(new Object[] { Collections.unmodifiableSortedMap(seedMap).entrySet() });
         cases.add(new Object[] { Collections.unmodifiableSortedMap(seedMap).keySet() });
         cases.add(new Object[] { Collections.unmodifiableSortedMap(seedMap).values() });
+        cases.add(new Object[] { Collections.unmodifiableNavigableMap(seedMap).entrySet() });
+        cases.add(new Object[] { Collections.unmodifiableNavigableMap(seedMap).keySet() });
+        cases.add(new Object[] { Collections.unmodifiableNavigableMap(seedMap).values() });
 
         // Synchronized
         cases.add(new Object[] { Collections.synchronizedCollection(seedList) });
         cases.add(new Object[] { Collections.synchronizedList(seedList) });
+        cases.add(new Object[] { Collections.synchronizedList(seedRandomAccess) });
         cases.add(new Object[] { Collections.synchronizedSet(seedSet) });
         cases.add(new Object[] { Collections.synchronizedSortedSet(seedSet) });
+        cases.add(new Object[] { Collections.synchronizedNavigableSet(seedSet) });
 
         // As sets from map also need to be synchronized on the map, thus a
         // wrapping layer exist and should not have default methods
@@ -91,12 +100,17 @@
         cases.add(new Object[] { Collections.synchronizedSortedMap(seedMap).entrySet() });
         cases.add(new Object[] { Collections.synchronizedSortedMap(seedMap).keySet() });
         cases.add(new Object[] { Collections.synchronizedSortedMap(seedMap).values() });
+        cases.add(new Object[] { Collections.synchronizedNavigableMap(seedMap).entrySet() });
+        cases.add(new Object[] { Collections.synchronizedNavigableMap(seedMap).keySet() });
+        cases.add(new Object[] { Collections.synchronizedNavigableMap(seedMap).values() });
 
         // Checked
         cases.add(new Object[] { Collections.checkedCollection(seedList, Integer.class) });
         cases.add(new Object[] { Collections.checkedList(seedList, Integer.class) });
+        cases.add(new Object[] { Collections.checkedList(seedRandomAccess, Integer.class) });
         cases.add(new Object[] { Collections.checkedSet(seedSet, Integer.class) });
         cases.add(new Object[] { Collections.checkedSortedSet(seedSet, Integer.class) });
+        cases.add(new Object[] { Collections.checkedNavigableSet(seedSet, Integer.class) });
         cases.add(new Object[] { Collections.checkedQueue(seedList, Integer.class) });
 
         // asLifoQueue is another wrapper