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

Comparing jsr166/src/test/tck/ConcurrentSkipListMapTest.java (file contents):
Revision 1.1 by dl, Tue Dec 28 16:15:59 2004 UTC vs.
Revision 1.5 by dl, Sat Oct 1 17:05:38 2005 UTC

# Line 192 | Line 192 | public class ConcurrentSkipListMapTest e
192          }
193      }
194  
195 +
196 +    /**
197 +     *  Values.toArray contains all values
198 +     */
199 +    public void testValuesToArray() {
200 +        ConcurrentSkipListMap map = map5();
201 +        Collection v = map.values();
202 +        Object[] ar = v.toArray();
203 +        ArrayList s = new ArrayList(Arrays.asList(ar));
204 +        assertEquals(5, ar.length);
205 +        assertTrue(s.contains("A"));
206 +        assertTrue(s.contains("B"));
207 +        assertTrue(s.contains("C"));
208 +        assertTrue(s.contains("D"));
209 +        assertTrue(s.contains("E"));
210 +    }
211 +
212      /**
213       * values collection contains all values
214       */
# Line 446 | Line 463 | public class ConcurrentSkipListMapTest e
463  
464      }
465  
466 +    /**
467 +     * lowerEntry, higherEntry, ceilingEntry, and floorEntry return
468 +     * imutable entries
469 +     */
470 +    public void testEntryImmutablity() {
471 +        ConcurrentSkipListMap map = map5();
472 +        Map.Entry e = map.lowerEntry(three);
473 +        assertEquals(two, e.getKey());
474 +        try {
475 +            e.setValue("X");
476 +            fail();
477 +        } catch(UnsupportedOperationException success) {}
478 +        e = map.higherEntry(zero);
479 +        assertEquals(one, e.getKey());
480 +        try {
481 +            e.setValue("X");
482 +            fail();
483 +        } catch(UnsupportedOperationException success) {}
484 +        e = map.floorEntry(one);
485 +        assertEquals(one, e.getKey());
486 +        try {
487 +            e.setValue("X");
488 +            fail();
489 +        } catch(UnsupportedOperationException success) {}
490 +        e = map.ceilingEntry(five);
491 +        assertEquals(five, e.getKey());
492 +        try {
493 +            e.setValue("X");
494 +            fail();
495 +        } catch(UnsupportedOperationException success) {}
496 +    }
497 +
498 +
499  
500      /**
501       * lowerKey returns preceding element
# Line 705 | Line 755 | public class ConcurrentSkipListMapTest e
755      }
756  
757      /**
758 +     * remove(x, null) returns false
759 +     */
760 +    public void testRemove3() {
761 +        try {
762 +            ConcurrentSkipListMap c = new ConcurrentSkipListMap();
763 +            c.put("sadsdf", "asdads");
764 +            assertFalse(c.remove("sadsdf", null));
765 +        } catch(NullPointerException e){
766 +            fail();
767 +        }
768 +    }
769 +
770 +    /**
771       * A deserialized map equals original
772       */
773      public void testSerialization() {
# Line 735 | Line 798 | public class ConcurrentSkipListMapTest e
798       */
799      public void testSubMapContents() {
800          ConcurrentSkipListMap map = map5();
801 <        NavigableMap sm = map.subMap(two, four);
801 >        NavigableMap sm = map.navigableSubMap(two, four);
802          assertEquals(two, sm.firstKey());
803          assertEquals(three, sm.lastKey());
804          assertEquals(2, sm.size());
# Line 773 | Line 836 | public class ConcurrentSkipListMapTest e
836  
837      public void testSubMapContents2() {
838          ConcurrentSkipListMap map = map5();
839 <        NavigableMap sm = map.subMap(two, three);
839 >        NavigableMap sm = map.navigableSubMap(two, three);
840          assertEquals(1, sm.size());
841          assertEquals(two, sm.firstKey());
842          assertEquals(two, sm.lastKey());
# Line 808 | Line 871 | public class ConcurrentSkipListMapTest e
871       */
872      public void testHeadMapContents() {
873          ConcurrentSkipListMap map = map5();
874 <        NavigableMap sm = map.headMap(four);
874 >        NavigableMap sm = map.navigableHeadMap(four);
875          assertTrue(sm.containsKey(one));
876          assertTrue(sm.containsKey(two));
877          assertTrue(sm.containsKey(three));
# Line 834 | Line 897 | public class ConcurrentSkipListMapTest e
897       */
898      public void testTailMapContents() {
899          ConcurrentSkipListMap map = map5();
900 <        NavigableMap sm = map.tailMap(two);
900 >        NavigableMap sm = map.navigableTailMap(two);
901          assertFalse(sm.containsKey(one));
902          assertTrue(sm.containsKey(two));
903          assertTrue(sm.containsKey(three));
# Line 878 | Line 941 | public class ConcurrentSkipListMapTest e
941          assertEquals("E", e.getValue());
942          assertFalse(i.hasNext());
943  
944 <        NavigableMap ssm = sm.tailMap(four);
944 >        NavigableMap ssm = sm.navigableTailMap(four);
945          assertEquals(four, ssm.firstKey());
946          assertEquals(five, ssm.lastKey());
947          assertTrue(ssm.remove(four) != null);

Diff Legend

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