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

Comparing jsr166/src/test/tck/TreeSetTest.java (file contents):
Revision 1.40 by jsr166, Sat May 23 00:53:08 2015 UTC vs.
Revision 1.46 by jsr166, Sat Mar 11 18:20:47 2017 UTC

# Line 40 | Line 40 | public class TreeSetTest extends JSR166T
40  
41      /**
42       * Returns a new set of given size containing consecutive
43 <     * Integers 0 ... n.
43 >     * Integers 0 ... n - 1.
44       */
45 <    private TreeSet<Integer> populatedSet(int n) {
46 <        TreeSet<Integer> q = new TreeSet<Integer>();
45 >    private static TreeSet<Integer> populatedSet(int n) {
46 >        TreeSet<Integer> q = new TreeSet<>();
47          assertTrue(q.isEmpty());
48 <        for (int i = n-1; i >= 0; i -= 2)
48 >        for (int i = n - 1; i >= 0; i -= 2)
49              assertTrue(q.add(new Integer(i)));
50          for (int i = (n & 1); i < n; i += 2)
51              assertTrue(q.add(new Integer(i)));
# Line 57 | Line 57 | public class TreeSetTest extends JSR166T
57      /**
58       * Returns a new set of first 5 ints.
59       */
60 <    private TreeSet set5() {
60 >    private static TreeSet set5() {
61          TreeSet q = new TreeSet();
62          assertTrue(q.isEmpty());
63          q.add(one);
# Line 290 | Line 290 | public class TreeSetTest extends JSR166T
290              assertTrue(q.contains(i));
291              assertTrue(q.remove(i));
292              assertFalse(q.contains(i));
293 <            assertTrue(q.contains(i-1));
293 >            assertTrue(q.contains(i - 1));
294          }
295          for (int i = 0; i < SIZE; i += 2) {
296              assertTrue(q.contains(i));
297              assertTrue(q.remove(i));
298              assertFalse(q.contains(i));
299 <            assertFalse(q.remove(i+1));
300 <            assertFalse(q.contains(i+1));
299 >            assertFalse(q.remove(i + 1));
300 >            assertFalse(q.contains(i + 1));
301          }
302          assertTrue(q.isEmpty());
303      }
# Line 695 | Line 695 | public class TreeSetTest extends JSR166T
695      }
696  
697      static NavigableSet<Integer> newSet(Class cl) throws Exception {
698 <        NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance();
698 >        NavigableSet<Integer> result =
699 >            (NavigableSet<Integer>) cl.getConstructor().newInstance();
700          assertEquals(0, result.size());
701          assertFalse(result.iterator().hasNext());
702          return result;
# Line 903 | Line 904 | public class TreeSetTest extends JSR166T
904                  else if (element > max)
905                      return -1;
906                  int result = bs.nextSetBit(element);
907 <                return result > max ? -1 : result;
907 >                return (result > max) ? -1 : result;
908              }
909              int higherAscending(int element) {
910                  return ceilingAscending(element + 1);
911              }
912              private int firstAscending() {
913                  int result = ceilingAscending(min);
914 <                return result > max ? -1 : result;
914 >                return (result > max) ? -1 : result;
915              }
916              private int lastAscending() {
917                  int result = floorAscending(max);
918 <                return result < min ? -1 : result;
918 >                return (result < min) ? -1 : result;
919              }
920          }
921          ReferenceSet rs = new ReferenceSet();
# Line 975 | Line 976 | public class TreeSetTest extends JSR166T
976      }
977  
978      static boolean eq(Integer i, int j) {
979 <        return i == null ? j == -1 : i == j;
979 >        return (i == null) ? j == -1 : i == j;
980      }
981  
982   }

Diff Legend

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