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.4 by dl, Sat May 28 14:02:00 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 705 | Line 722 | public class ConcurrentSkipListMapTest e
722      }
723  
724      /**
725 +     * remove(x, null) returns false
726 +     */
727 +    public void testRemove3() {
728 +        try {
729 +            ConcurrentSkipListMap c = new ConcurrentSkipListMap();
730 +            c.put("sadsdf", "asdads");
731 +            assertFalse(c.remove("sadsdf", null));
732 +        } catch(NullPointerException e){
733 +            fail();
734 +        }
735 +    }
736 +
737 +    /**
738       * A deserialized map equals original
739       */
740      public void testSerialization() {
# Line 735 | Line 765 | public class ConcurrentSkipListMapTest e
765       */
766      public void testSubMapContents() {
767          ConcurrentSkipListMap map = map5();
768 <        NavigableMap sm = map.subMap(two, four);
768 >        NavigableMap sm = map.navigableSubMap(two, four);
769          assertEquals(two, sm.firstKey());
770          assertEquals(three, sm.lastKey());
771          assertEquals(2, sm.size());
# Line 773 | Line 803 | public class ConcurrentSkipListMapTest e
803  
804      public void testSubMapContents2() {
805          ConcurrentSkipListMap map = map5();
806 <        NavigableMap sm = map.subMap(two, three);
806 >        NavigableMap sm = map.navigableSubMap(two, three);
807          assertEquals(1, sm.size());
808          assertEquals(two, sm.firstKey());
809          assertEquals(two, sm.lastKey());
# Line 808 | Line 838 | public class ConcurrentSkipListMapTest e
838       */
839      public void testHeadMapContents() {
840          ConcurrentSkipListMap map = map5();
841 <        NavigableMap sm = map.headMap(four);
841 >        NavigableMap sm = map.navigableHeadMap(four);
842          assertTrue(sm.containsKey(one));
843          assertTrue(sm.containsKey(two));
844          assertTrue(sm.containsKey(three));
# Line 834 | Line 864 | public class ConcurrentSkipListMapTest e
864       */
865      public void testTailMapContents() {
866          ConcurrentSkipListMap map = map5();
867 <        NavigableMap sm = map.tailMap(two);
867 >        NavigableMap sm = map.navigableTailMap(two);
868          assertFalse(sm.containsKey(one));
869          assertTrue(sm.containsKey(two));
870          assertTrue(sm.containsKey(three));
# Line 878 | Line 908 | public class ConcurrentSkipListMapTest e
908          assertEquals("E", e.getValue());
909          assertFalse(i.hasNext());
910  
911 <        NavigableMap ssm = sm.tailMap(four);
911 >        NavigableMap ssm = sm.navigableTailMap(four);
912          assertEquals(four, ssm.firstKey());
913          assertEquals(five, ssm.lastKey());
914          assertTrue(ssm.remove(four) != null);

Diff Legend

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