ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/TreeSetTest.java
(Generate patch)

Comparing jsr166/src/test/tck/TreeSetTest.java (file contents):
Revision 1.10 by jsr166, Sat Nov 21 17:38:06 2009 UTC vs.
Revision 1.23 by jsr166, Tue May 31 16:16:24 2011 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7   import junit.framework.*;
8 < import java.util.*;
9 < import java.util.concurrent.*;
10 < import java.io.*;
8 > import java.util.Arrays;
9 > import java.util.BitSet;
10 > import java.util.Collection;
11 > import java.util.Comparator;
12 > import java.util.Iterator;
13 > import java.util.NavigableSet;
14 > import java.util.NoSuchElementException;
15 > import java.util.Random;
16 > import java.util.Set;
17 > import java.util.SortedSet;
18 > import java.util.TreeSet;
19  
20   public class TreeSetTest extends JSR166TestCase {
21      public static void main(String[] args) {
22 <        junit.textui.TestRunner.run (suite());
22 >        junit.textui.TestRunner.run(suite());
23      }
24      public static Test suite() {
25          return new TestSuite(TreeSetTest.class);
# Line 19 | Line 27 | public class TreeSetTest extends JSR166T
27  
28      static class MyReverseComparator implements Comparator {
29          public int compare(Object x, Object y) {
30 <            int i = ((Integer)x).intValue();
23 <            int j = ((Integer)y).intValue();
24 <            if (i < j) return 1;
25 <            if (i > j) return -1;
26 <            return 0;
30 >            return ((Comparable)y).compareTo(x);
31          }
32      }
33  
# Line 36 | Line 40 | public class TreeSetTest extends JSR166T
40       * Create a set of given size containing consecutive
41       * Integers 0 ... n.
42       */
43 <    private TreeSet populatedSet(int n) {
44 <        TreeSet q = new TreeSet();
43 >    private TreeSet<Integer> populatedSet(int n) {
44 >        TreeSet<Integer> q = new TreeSet<Integer>();
45          assertTrue(q.isEmpty());
46          for (int i = n-1; i >= 0; i-=2)
47              assertTrue(q.add(new Integer(i)));
# Line 212 | Line 216 | public class TreeSetTest extends JSR166T
216              shouldThrow();
217          } catch (NullPointerException success) {}
218      }
219 +
220      /**
221       * addAll of a collection with null elements throws NPE
222       */
# Line 223 | Line 228 | public class TreeSetTest extends JSR166T
228              shouldThrow();
229          } catch (NullPointerException success) {}
230      }
231 +
232      /**
233       * addAll of a collection with any null elements throws NPE after
234       * possibly adding some elements
# Line 259 | Line 265 | public class TreeSetTest extends JSR166T
265      public void testPollFirst() {
266          TreeSet q = populatedSet(SIZE);
267          for (int i = 0; i < SIZE; ++i) {
268 <            assertEquals(i, ((Integer)q.pollFirst()).intValue());
268 >            assertEquals(i, q.pollFirst());
269          }
270          assertNull(q.pollFirst());
271      }
# Line 270 | Line 276 | public class TreeSetTest extends JSR166T
276      public void testPollLast() {
277          TreeSet q = populatedSet(SIZE);
278          for (int i = SIZE-1; i >= 0; --i) {
279 <            assertEquals(i, ((Integer)q.pollLast()).intValue());
279 >            assertEquals(i, q.pollLast());
280          }
281          assertNull(q.pollFirst());
282      }
283  
278 –
284      /**
285       * remove(x) removes x and returns true if present
286       */
287      public void testRemoveElement() {
288          TreeSet q = populatedSet(SIZE);
289          for (int i = 1; i < SIZE; i+=2) {
290 <            assertTrue(q.remove(new Integer(i)));
290 >            assertTrue(q.contains(i));
291 >            assertTrue(q.remove(i));
292 >            assertFalse(q.contains(i));
293 >            assertTrue(q.contains(i-1));
294          }
295          for (int i = 0; i < SIZE; i+=2) {
296 <            assertTrue(q.remove(new Integer(i)));
297 <            assertFalse(q.remove(new Integer(i+1)));
296 >            assertTrue(q.contains(i));
297 >            assertTrue(q.remove(i));
298 >            assertFalse(q.contains(i));
299 >            assertFalse(q.remove(i+1));
300 >            assertFalse(q.contains(i+1));
301          }
302          assertTrue(q.isEmpty());
303      }
# Line 366 | Line 377 | public class TreeSetTest extends JSR166T
377          }
378      }
379  
369 –
370 –
380      /**
381       * lower returns preceding element
382       */
# Line 384 | Line 393 | public class TreeSetTest extends JSR166T
393  
394          Object e4 = q.lower(zero);
395          assertNull(e4);
387 –
396      }
397  
398      /**
# Line 403 | Line 411 | public class TreeSetTest extends JSR166T
411  
412          Object e4 = q.higher(six);
413          assertNull(e4);
406 –
414      }
415  
416      /**
# Line 422 | Line 429 | public class TreeSetTest extends JSR166T
429  
430          Object e4 = q.floor(zero);
431          assertNull(e4);
425 –
432      }
433  
434      /**
# Line 441 | Line 447 | public class TreeSetTest extends JSR166T
447  
448          Object e4 = q.ceiling(six);
449          assertNull(e4);
444 –
450      }
451  
452      /**
453 <     * toArray contains all elements
453 >     * toArray contains all elements in sorted order
454       */
455      public void testToArray() {
456          TreeSet q = populatedSet(SIZE);
457          Object[] o = q.toArray();
453 –        Arrays.sort(o);
458          for (int i = 0; i < o.length; i++)
459 <            assertEquals(o[i], q.pollFirst());
459 >            assertSame(o[i], q.pollFirst());
460      }
461  
462      /**
463 <     * toArray(a) contains all elements
463 >     * toArray(a) contains all elements in sorted order
464       */
465      public void testToArray2() {
466 <        TreeSet q = populatedSet(SIZE);
466 >        TreeSet<Integer> q = populatedSet(SIZE);
467          Integer[] ints = new Integer[SIZE];
468 <        ints = (Integer[])q.toArray(ints);
469 <        Arrays.sort(ints);
468 >        Integer[] array = q.toArray(ints);
469 >        assertSame(ints, array);
470          for (int i = 0; i < ints.length; i++)
471 <            assertEquals(ints[i], q.pollFirst());
471 >            assertSame(ints[i], q.pollFirst());
472      }
473  
474      /**
# Line 498 | Line 502 | public class TreeSetTest extends JSR166T
502      /**
503       * iterator.remove removes current element
504       */
505 <    public void testIteratorRemove () {
505 >    public void testIteratorRemove() {
506          final TreeSet q = new TreeSet();
507          q.add(new Integer(2));
508          q.add(new Integer(1));
# Line 514 | Line 518 | public class TreeSetTest extends JSR166T
518          assertFalse(it.hasNext());
519      }
520  
517 –
521      /**
522       * toString contains toStrings of elements
523       */
# Line 522 | Line 525 | public class TreeSetTest extends JSR166T
525          TreeSet q = populatedSet(SIZE);
526          String s = q.toString();
527          for (int i = 0; i < SIZE; ++i) {
528 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
528 >            assertTrue(s.contains(String.valueOf(i)));
529          }
530      }
531  
# Line 530 | Line 533 | public class TreeSetTest extends JSR166T
533       * A deserialized serialized set has same elements
534       */
535      public void testSerialization() throws Exception {
536 <        TreeSet q = populatedSet(SIZE);
537 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
538 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
539 <        out.writeObject(q);
540 <        out.close();
541 <
542 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
543 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
544 <        TreeSet r = (TreeSet)in.readObject();
545 <        assertEquals(q.size(), r.size());
546 <        while (!q.isEmpty())
547 <            assertEquals(q.pollFirst(), r.pollFirst());
536 >        NavigableSet x = populatedSet(SIZE);
537 >        NavigableSet y = serialClone(x);
538 >
539 >        assertTrue(x != y);
540 >        assertEquals(x.size(), y.size());
541 >        assertEquals(x, y);
542 >        assertEquals(y, x);
543 >        while (!x.isEmpty()) {
544 >            assertFalse(y.isEmpty());
545 >            assertEquals(x.pollFirst(), y.pollFirst());
546 >        }
547 >        assertTrue(y.isEmpty());
548      }
549  
550      /**
# Line 670 | Line 673 | public class TreeSetTest extends JSR166T
673       * Subsets of subsets subdivide correctly
674       */
675      public void testRecursiveSubSets() throws Exception {
676 <        int setSize = 1000;
676 >        int setSize = expensiveTests ? 1000 : 100;
677          Class cl = TreeSet.class;
678  
679          NavigableSet<Integer> set = newSet(cl);
# Line 851 | Line 854 | public class TreeSetTest extends JSR166T
854       */
855      void check(NavigableSet<Integer> set,
856                        final int min, final int max, final boolean ascending) {
857 <       class ReferenceSet {
857 >        class ReferenceSet {
858              int lower(int element) {
859                  return ascending ?
860                      lowerAscending(element) : higherAscending(element);
# Line 886 | Line 889 | public class TreeSetTest extends JSR166T
889                  // BitSet should support this! Test would run much faster
890                  while (element >= min) {
891                      if (bs.get(element))
892 <                        return(element);
892 >                        return element;
893                      element--;
894                  }
895                  return -1;

Diff Legend

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