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.19 by jsr166, Thu Nov 18 20:21:54 2010 UTC

# Line 11 | Line 11 | import java.io.*;
11  
12   public class TreeSetTest extends JSR166TestCase {
13      public static void main(String[] args) {
14 <        junit.textui.TestRunner.run (suite());
14 >        junit.textui.TestRunner.run(suite());
15      }
16      public static Test suite() {
17          return new TestSuite(TreeSetTest.class);
# Line 19 | Line 19 | public class TreeSetTest extends JSR166T
19  
20      static class MyReverseComparator implements Comparator {
21          public int compare(Object x, Object y) {
22 <            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;
22 >            return ((Comparable)y).compareTo(x);
23          }
24      }
25  
# Line 36 | Line 32 | public class TreeSetTest extends JSR166T
32       * Create a set of given size containing consecutive
33       * Integers 0 ... n.
34       */
35 <    private TreeSet populatedSet(int n) {
36 <        TreeSet q = new TreeSet();
35 >    private TreeSet<Integer> populatedSet(int n) {
36 >        TreeSet<Integer> q = new TreeSet<Integer>();
37          assertTrue(q.isEmpty());
38          for (int i = n-1; i >= 0; i-=2)
39              assertTrue(q.add(new Integer(i)));
# Line 212 | Line 208 | public class TreeSetTest extends JSR166T
208              shouldThrow();
209          } catch (NullPointerException success) {}
210      }
211 +
212      /**
213       * addAll of a collection with null elements throws NPE
214       */
# Line 223 | Line 220 | public class TreeSetTest extends JSR166T
220              shouldThrow();
221          } catch (NullPointerException success) {}
222      }
223 +
224      /**
225       * addAll of a collection with any null elements throws NPE after
226       * possibly adding some elements
# Line 259 | Line 257 | public class TreeSetTest extends JSR166T
257      public void testPollFirst() {
258          TreeSet q = populatedSet(SIZE);
259          for (int i = 0; i < SIZE; ++i) {
260 <            assertEquals(i, ((Integer)q.pollFirst()).intValue());
260 >            assertEquals(i, q.pollFirst());
261          }
262          assertNull(q.pollFirst());
263      }
# Line 270 | Line 268 | public class TreeSetTest extends JSR166T
268      public void testPollLast() {
269          TreeSet q = populatedSet(SIZE);
270          for (int i = SIZE-1; i >= 0; --i) {
271 <            assertEquals(i, ((Integer)q.pollLast()).intValue());
271 >            assertEquals(i, q.pollLast());
272          }
273          assertNull(q.pollFirst());
274      }
# Line 282 | Line 280 | public class TreeSetTest extends JSR166T
280      public void testRemoveElement() {
281          TreeSet q = populatedSet(SIZE);
282          for (int i = 1; i < SIZE; i+=2) {
283 <            assertTrue(q.remove(new Integer(i)));
283 >            assertTrue(q.contains(i));
284 >            assertTrue(q.remove(i));
285 >            assertFalse(q.contains(i));
286 >            assertTrue(q.contains(i-1));
287          }
288          for (int i = 0; i < SIZE; i+=2) {
289 <            assertTrue(q.remove(new Integer(i)));
290 <            assertFalse(q.remove(new Integer(i+1)));
289 >            assertTrue(q.contains(i));
290 >            assertTrue(q.remove(i));
291 >            assertFalse(q.contains(i));
292 >            assertFalse(q.remove(i+1));
293 >            assertFalse(q.contains(i+1));
294          }
295          assertTrue(q.isEmpty());
296      }
# Line 384 | Line 388 | public class TreeSetTest extends JSR166T
388  
389          Object e4 = q.lower(zero);
390          assertNull(e4);
387 –
391      }
392  
393      /**
# Line 403 | Line 406 | public class TreeSetTest extends JSR166T
406  
407          Object e4 = q.higher(six);
408          assertNull(e4);
406 –
409      }
410  
411      /**
# Line 422 | Line 424 | public class TreeSetTest extends JSR166T
424  
425          Object e4 = q.floor(zero);
426          assertNull(e4);
425 –
427      }
428  
429      /**
# Line 441 | Line 442 | public class TreeSetTest extends JSR166T
442  
443          Object e4 = q.ceiling(six);
444          assertNull(e4);
444 –
445      }
446  
447      /**
448 <     * toArray contains all elements
448 >     * toArray contains all elements in sorted order
449       */
450      public void testToArray() {
451          TreeSet q = populatedSet(SIZE);
452          Object[] o = q.toArray();
453 –        Arrays.sort(o);
453          for (int i = 0; i < o.length; i++)
454 <            assertEquals(o[i], q.pollFirst());
454 >            assertSame(o[i], q.pollFirst());
455      }
456  
457      /**
458 <     * toArray(a) contains all elements
458 >     * toArray(a) contains all elements in sorted order
459       */
460      public void testToArray2() {
461 <        TreeSet q = populatedSet(SIZE);
461 >        TreeSet<Integer> q = populatedSet(SIZE);
462          Integer[] ints = new Integer[SIZE];
463 <        ints = (Integer[])q.toArray(ints);
464 <        Arrays.sort(ints);
463 >        Integer[] array = q.toArray(ints);
464 >        assertSame(ints, array);
465          for (int i = 0; i < ints.length; i++)
466 <            assertEquals(ints[i], q.pollFirst());
466 >            assertSame(ints[i], q.pollFirst());
467      }
468  
469      /**
# Line 498 | Line 497 | public class TreeSetTest extends JSR166T
497      /**
498       * iterator.remove removes current element
499       */
500 <    public void testIteratorRemove () {
500 >    public void testIteratorRemove() {
501          final TreeSet q = new TreeSet();
502          q.add(new Integer(2));
503          q.add(new Integer(1));
# Line 670 | Line 669 | public class TreeSetTest extends JSR166T
669       * Subsets of subsets subdivide correctly
670       */
671      public void testRecursiveSubSets() throws Exception {
672 <        int setSize = 1000;
672 >        int setSize = expensiveTests ? 1000 : 100;
673          Class cl = TreeSet.class;
674  
675          NavigableSet<Integer> set = newSet(cl);
# Line 886 | Line 885 | public class TreeSetTest extends JSR166T
885                  // BitSet should support this! Test would run much faster
886                  while (element >= min) {
887                      if (bs.get(element))
888 <                        return(element);
888 >                        return element;
889                      element--;
890                  }
891                  return -1;

Diff Legend

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