ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/ConcurrentSkipListMapTest.java

Comparing jsr166/src/test/tck/ConcurrentSkipListMapTest.java (file contents):
Revision 1.9 by jsr166, Mon Nov 2 20:28:31 2009 UTC vs.
Revision 1.10 by jsr166, Mon Nov 16 04:57:10 2009 UTC

#	Line 517 | Line 517 | public class ConcurrentSkipListMapTest e
517		try {
518		e.setValue("X");
519		fail();
520	<	} catch(UnsupportedOperationException success) {}
520	>	} catch (UnsupportedOperationException success) {}
521		e = map.higherEntry(zero);
522		assertEquals(one, e.getKey());
523		try {
524		e.setValue("X");
525		fail();
526	<	} catch(UnsupportedOperationException success) {}
526	>	} catch (UnsupportedOperationException success) {}
527		e = map.floorEntry(one);
528		assertEquals(one, e.getKey());
529		try {
530		e.setValue("X");
531		fail();
532	<	} catch(UnsupportedOperationException success) {}
532	>	} catch (UnsupportedOperationException success) {}
533		e = map.ceilingEntry(five);
534		assertEquals(five, e.getKey());
535		try {
536		e.setValue("X");
537		fail();
538	<	} catch(UnsupportedOperationException success) {}
538	>	} catch (UnsupportedOperationException success) {}
539		}
540
541
#	Line 703 | Line 703 | public class ConcurrentSkipListMapTest e
703		ConcurrentSkipListMap c = map5();
704		c.get(null);
705		shouldThrow();
706	<	} catch(NullPointerException e){}
706	>	} catch (NullPointerException e){}
707		}
708
709		/**
#	Line 714 | Line 714 | public class ConcurrentSkipListMapTest e
714		ConcurrentSkipListMap c = map5();
715		c.containsKey(null);
716		shouldThrow();
717	<	} catch(NullPointerException e){}
717	>	} catch (NullPointerException e){}
718		}
719
720		/**
#	Line 725 | Line 725 | public class ConcurrentSkipListMapTest e
725		ConcurrentSkipListMap c = new ConcurrentSkipListMap();
726		c.containsValue(null);
727		shouldThrow();
728	<	} catch(NullPointerException e){}
728	>	} catch (NullPointerException e){}
729		}
730
731
#	Line 737 | Line 737 | public class ConcurrentSkipListMapTest e
737		ConcurrentSkipListMap c = map5();
738		c.put(null, "whatever");
739		shouldThrow();
740	<	} catch(NullPointerException e){}
740	>	} catch (NullPointerException e){}
741		}
742
743		/**
#	Line 748 | Line 748 | public class ConcurrentSkipListMapTest e
748		ConcurrentSkipListMap c = map5();
749		c.putIfAbsent(null, "whatever");
750		shouldThrow();
751	<	} catch(NullPointerException e){}
751	>	} catch (NullPointerException e){}
752		}
753
754		/**
#	Line 759 | Line 759 | public class ConcurrentSkipListMapTest e
759		ConcurrentSkipListMap c = map5();
760		c.replace(null, "whatever");
761		shouldThrow();
762	<	} catch(NullPointerException e){}
762	>	} catch (NullPointerException e){}
763		}
764
765		/**
#	Line 770 | Line 770 | public class ConcurrentSkipListMapTest e
770		ConcurrentSkipListMap c = map5();
771		c.replace(null, one, "whatever");
772		shouldThrow();
773	<	} catch(NullPointerException e){}
773	>	} catch (NullPointerException e){}
774		}
775
776		/**
#	Line 782 | Line 782 | public class ConcurrentSkipListMapTest e
782		c.put("sadsdf", "asdads");
783		c.remove(null);
784		shouldThrow();
785	<	} catch(NullPointerException e){}
785	>	} catch (NullPointerException e){}
786		}
787
788		/**
#	Line 794 | Line 794 | public class ConcurrentSkipListMapTest e
794		c.put("sadsdf", "asdads");
795		c.remove(null, "whatever");
796		shouldThrow();
797	<	} catch(NullPointerException e){}
797	>	} catch (NullPointerException e){}
798		}
799
800		/**
#	Line 805 | Line 805 | public class ConcurrentSkipListMapTest e
805		ConcurrentSkipListMap c = new ConcurrentSkipListMap();
806		c.put("sadsdf", "asdads");
807		assertFalse(c.remove("sadsdf", null));
808	<	} catch(NullPointerException e){
808	>	} catch (NullPointerException e){
809		fail();
810		}
811		}
#	Line 828 | Line 828 | public class ConcurrentSkipListMapTest e
828		assertEquals(q.size(), r.size());
829		assertTrue(q.equals(r));
830		assertTrue(r.equals(q));
831	<	} catch(Exception e){
831	>	} catch (Exception e){
832		e.printStackTrace();
833		unexpectedException();
834		}
#	Line 1021 | Line 1021 | public class ConcurrentSkipListMapTest e
1021		NavigableMap<Integer, Integer> result = null;
1022		try {
1023		result = (NavigableMap<Integer, Integer>) cl.newInstance();
1024	<	} catch(Exception e) {
1024	>	} catch (Exception e) {
1025		fail();
1026		}
1027		assertEquals(result.size(), 0);
#	Line 1046 | Line 1046 | public class ConcurrentSkipListMapTest e
1046		}
1047
1048		// Remove a bunch of entries with iterator
1049	<	for(Iterator<Integer> it = map.keySet().iterator(); it.hasNext(); ) {
1049	>	for (Iterator<Integer> it = map.keySet().iterator(); it.hasNext(); ) {
1050		if (rnd.nextBoolean()) {
1051		bs.clear(it.next());
1052		it.remove();
#	Line 1071 | Line 1071 | public class ConcurrentSkipListMapTest e
1071		}
1072
1073		// Remove a bunch of entries with iterator
1074	<	for(Iterator<Integer> it = map.keySet().iterator(); it.hasNext(); ) {
1074	>	for (Iterator<Integer> it = map.keySet().iterator(); it.hasNext(); ) {
1075		if (rnd.nextBoolean()) {
1076		bs.clear(it.next());
1077		it.remove();
#	Line 1087 | Line 1087 | public class ConcurrentSkipListMapTest e
1087		try {
1088		map.put(key, 2 * key);
1089		fail();
1090	<	} catch(IllegalArgumentException e) {
1090	>	} catch (IllegalArgumentException e) {
1091		// expected
1092		}
1093		}
#	Line 1285 | Line 1285 | public class ConcurrentSkipListMapTest e
1285		try {
1286		map.firstKey();
1287		fail();
1288	<	} catch(NoSuchElementException e) {
1288	>	} catch (NoSuchElementException e) {
1289		// expected
1290		}
1291		try {
1292		map.lastKey();
1293		fail();
1294	<	} catch(NoSuchElementException e) {
1294	>	} catch (NoSuchElementException e) {
1295		// expected
1296		}
1297		}

Diff Legend

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