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

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.37 by jsr166, Fri Aug 4 03:30:22 2017 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 473 | Line 473 | public class TreeSubSetTest extends JSR1
473      }
474  
475      /**
476 <     * A deserialized serialized set has same elements
476 >     * A deserialized/reserialized set equals original
477       */
478      public void testSerialization() throws Exception {
479          NavigableSet x = populatedSet(SIZE);
# Line 727 | Line 727 | public class TreeSubSetTest extends JSR1
727          }
728          for (int i = 0; i < SIZE; i += 2) {
729              assertTrue(q.remove(new Integer(i)));
730 <            assertFalse(q.remove(new Integer(i+1)));
730 >            assertFalse(q.remove(new Integer(i + 1)));
731          }
732          assertTrue(q.isEmpty());
733      }
# Line 961 | Line 961 | public class TreeSubSetTest extends JSR1
961      }
962  
963      /**
964 <     * A deserialized serialized set has same elements
964 >     * A deserialized/reserialized set equals original
965       */
966      public void testDescendingSerialization() throws Exception {
967          NavigableSet x = dset5();

Diff Legend

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