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.32 by jsr166, Sat May 23 00:53:08 2015 UTC vs.
Revision 1.38 by jsr166, Mon May 28 21:19:50 2018 UTC

#	Line 31 | Line 31 | public class TreeSubSetTest extends JSR1
31
32		/**
33		* Returns a new set of given size containing consecutive
34	<	* Integers 0 ... n.
34	>	* Integers 0 ... n - 1.
35		*/
36	<	private NavigableSet<Integer> populatedSet(int n) {
37	<	TreeSet<Integer> q = new TreeSet<Integer>();
36	>	private static NavigableSet<Integer> populatedSet(int n) {
37	>	TreeSet<Integer> q = new TreeSet<>();
38		assertTrue(q.isEmpty());
39
40	<	for (int i = n-1; i >= 0; i -= 2)
40	>	for (int i = n - 1; i >= 0; i -= 2)
41		assertTrue(q.add(new Integer(i)));
42		for (int i = (n & 1); i < n; i += 2)
43		assertTrue(q.add(new Integer(i)));
#	Line 52 | Line 52 | public class TreeSubSetTest extends JSR1
52		/**
53		* Returns a new set of first 5 ints.
54		*/
55	<	private NavigableSet set5() {
55	>	private static NavigableSet set5() {
56		TreeSet q = new TreeSet();
57		assertTrue(q.isEmpty());
58		q.add(one);
#	Line 67 | Line 67 | public class TreeSubSetTest extends JSR1
67		return s;
68		}
69
70	<	private NavigableSet dset5() {
70	>	private static NavigableSet dset5() {
71		TreeSet q = new TreeSet();
72		assertTrue(q.isEmpty());
73		q.add(m1);
#	Line 241 | Line 241 | public class TreeSubSetTest extends JSR1
241		assertTrue(q.contains(i));
242		assertTrue(q.remove(i));
243		assertFalse(q.contains(i));
244	<	assertTrue(q.contains(i-1));
244	>	assertTrue(q.contains(i - 1));
245		}
246		for (int i = 0; i < SIZE; i += 2) {
247		assertTrue(q.contains(i));
248		assertTrue(q.remove(i));
249		assertFalse(q.contains(i));
250	<	assertFalse(q.remove(i+1));
251	<	assertFalse(q.contains(i+1));
250	>	assertFalse(q.remove(i + 1));
251	>	assertFalse(q.contains(i + 1));
252		}
253		assertTrue(q.isEmpty());
254		}
#	Line 405 | Line 405 | public class TreeSubSetTest extends JSR1
405		*/
406		public void testToArray() {
407		NavigableSet q = populatedSet(SIZE);
408	<	Object[] o = q.toArray();
409	<	for (int i = 0; i < o.length; i++)
410	<	assertSame(o[i], q.pollFirst());
408	>	Object[] a = q.toArray();
409	>	assertSame(Object[].class, a.getClass());
410	>	for (Object o : a)
411	>	assertSame(o, q.pollFirst());
412	>	assertTrue(q.isEmpty());
413		}
414
415		/**
#	Line 418 | Line 420 | public class TreeSubSetTest extends JSR1
420		Integer[] ints = new Integer[SIZE];
421		Integer[] array = q.toArray(ints);
422		assertSame(ints, array);
423	<	for (int i = 0; i < ints.length; i++)
424	<	assertSame(ints[i], q.pollFirst());
423	>	for (Integer o : ints)
424	>	assertSame(o, q.pollFirst());
425	>	assertTrue(q.isEmpty());
426		}
427
428		/**
#	Line 473 | Line 476 | public class TreeSubSetTest extends JSR1
476		}
477
478		/**
479	<	* A deserialized serialized set has same elements
479	>	* A deserialized/reserialized set equals original
480		*/
481		public void testSerialization() throws Exception {
482		NavigableSet x = populatedSet(SIZE);
#	Line 727 | Line 730 | public class TreeSubSetTest extends JSR1
730		}
731		for (int i = 0; i < SIZE; i += 2) {
732		assertTrue(q.remove(new Integer(i)));
733	<	assertFalse(q.remove(new Integer(i+1)));
733	>	assertFalse(q.remove(new Integer(i + 1)));
734		}
735		assertTrue(q.isEmpty());
736		}
#	Line 961 | Line 964 | public class TreeSubSetTest extends JSR1
964		}
965
966		/**
967	<	* A deserialized serialized set has same elements
967	>	* A deserialized/reserialized set equals original
968		*/
969		public void testDescendingSerialization() throws Exception {
970		NavigableSet x = dset5();

Diff Legend

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