ViewVC Help

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

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

Comparing jsr166/src/test/tck/TreeSubSetTest.java (file contents):
Revision 1.9 by jsr166, Sat Nov 21 10:29:50 2009 UTC vs.
Revision 1.11 by jsr166, Tue Dec 1 09:43:19 2009 UTC

#	Line 19 | Line 19 | public class TreeSubSetTest extends JSR1
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 104 | Line 100 | public class TreeSubSetTest extends JSR1
100		public void testEmpty() {
101		NavigableSet q = set0();
102		assertTrue(q.isEmpty());
103	<	q.add(new Integer(1));
103	>	assertTrue(q.add(new Integer(1)));
104		assertFalse(q.isEmpty());
105	<	q.add(new Integer(2));
105	>	assertTrue(q.add(new Integer(2)));
106		q.pollFirst();
107		q.pollFirst();
108		assertTrue(q.isEmpty());
#	Line 226 | Line 222 | public class TreeSubSetTest extends JSR1
222		public void testPoll() {
223		NavigableSet q = populatedSet(SIZE);
224		for (int i = 0; i < SIZE; ++i) {
225	<	assertEquals(i, ((Integer)q.pollFirst()).intValue());
225	>	assertEquals(i, q.pollFirst());
226		}
227		assertNull(q.pollFirst());
228		}
#	Line 266 | Line 262 | public class TreeSubSetTest extends JSR1
262		q.clear();
263		assertTrue(q.isEmpty());
264		assertEquals(0, q.size());
265	<	q.add(new Integer(1));
265	>	assertTrue(q.add(new Integer(1)));
266		assertFalse(q.isEmpty());
267		q.clear();
268		assertTrue(q.isEmpty());
#	Line 339 | Line 335 | public class TreeSubSetTest extends JSR1
335
336		Object e4 = q.lower(zero);
337		assertNull(e4);
342	–
338		}
339
340		/**
#	Line 358 | Line 353 | public class TreeSubSetTest extends JSR1
353
354		Object e4 = q.higher(six);
355		assertNull(e4);
361	–
356		}
357
358		/**
#	Line 377 | Line 371 | public class TreeSubSetTest extends JSR1
371
372		Object e4 = q.floor(zero);
373		assertNull(e4);
380	–
374		}
375
376		/**
#	Line 396 | Line 389 | public class TreeSubSetTest extends JSR1
389
390		Object e4 = q.ceiling(six);
391		assertNull(e4);
399	–
392		}
393
394		/**
#	Line 464 | Line 456 | public class TreeSubSetTest extends JSR1
456		it.remove();
457
458		it = q.iterator();
459	<	assertEquals(it.next(), new Integer(2));
460	<	assertEquals(it.next(), new Integer(3));
459	>	assertEquals(it.next(), 2);
460	>	assertEquals(it.next(), 3);
461		assertFalse(it.hasNext());
462		}
463
#	Line 721 | Line 713 | public class TreeSubSetTest extends JSR1
713		public void testDescendingPoll() {
714		NavigableSet q = populatedSet(SIZE);
715		for (int i = 0; i < SIZE; ++i) {
716	<	assertEquals(i, ((Integer)q.pollFirst()).intValue());
716	>	assertEquals(i, q.pollFirst());
717		}
718		assertNull(q.pollFirst());
719		}
#	Line 761 | Line 753 | public class TreeSubSetTest extends JSR1
753		q.clear();
754		assertTrue(q.isEmpty());
755		assertEquals(0, q.size());
756	<	q.add(new Integer(1));
756	>	assertTrue(q.add(new Integer(1)));
757		assertFalse(q.isEmpty());
758		q.clear();
759		assertTrue(q.isEmpty());
#	Line 834 | Line 826 | public class TreeSubSetTest extends JSR1
826
827		Object e4 = q.lower(zero);
828		assertNull(e4);
837	–
829		}
830
831		/**
#	Line 853 | Line 844 | public class TreeSubSetTest extends JSR1
844
845		Object e4 = q.higher(m6);
846		assertNull(e4);
856	–
847		}
848
849		/**
#	Line 872 | Line 862 | public class TreeSubSetTest extends JSR1
862
863		Object e4 = q.floor(zero);
864		assertNull(e4);
875	–
865		}
866
867		/**
#	Line 891 | Line 880 | public class TreeSubSetTest extends JSR1
880
881		Object e4 = q.ceiling(m6);
882		assertNull(e4);
894	–
883		}
884
885		/**
#	Line 959 | Line 947 | public class TreeSubSetTest extends JSR1
947		it.remove();
948
949		it = q.iterator();
950	<	assertEquals(it.next(), new Integer(2));
951	<	assertEquals(it.next(), new Integer(3));
950	>	assertEquals(it.next(), 2);
951	>	assertEquals(it.next(), 3);
952		assertFalse(it.hasNext());
953		}
954

Diff Legend

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