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

Comparing jsr166/src/test/tck/ConcurrentSkipListSetTest.java (file contents):
Revision 1.40 by jsr166, Sat May 23 00:53:08 2015 UTC vs.
Revision 1.45 by jsr166, Sun Oct 16 20:44:18 2016 UTC

# Line 35 | Line 35 | public class ConcurrentSkipListSetTest e
35  
36      /**
37       * Returns a new set of given size containing consecutive
38 <     * Integers 0 ... n.
38 >     * Integers 0 ... n - 1.
39       */
40      private ConcurrentSkipListSet<Integer> populatedSet(int n) {
41          ConcurrentSkipListSet<Integer> q =
42              new ConcurrentSkipListSet<Integer>();
43          assertTrue(q.isEmpty());
44 <        for (int i = n-1; i >= 0; i -= 2)
44 >        for (int i = n - 1; i >= 0; i -= 2)
45              assertTrue(q.add(new Integer(i)));
46          for (int i = (n & 1); i < n; i += 2)
47              assertTrue(q.add(new Integer(i)));
# Line 199 | Line 199 | public class ConcurrentSkipListSetTest e
199              q.add(new Object());
200              q.add(new Object());
201              shouldThrow();
202 <        } catch (ClassCastException success) {}
202 >        } catch (ClassCastException success) {
203 >            assertTrue(q.size() < 2);
204 >            for (int i = 0, size = q.size(); i < size; i++)
205 >                assertTrue(q.pollFirst().getClass() == Object.class);
206 >            assertNull(q.pollFirst());
207 >            assertTrue(q.isEmpty());
208 >            assertEquals(0, q.size());
209 >        }
210      }
211  
212      /**
# Line 286 | Line 293 | public class ConcurrentSkipListSetTest e
293              assertTrue(q.contains(i));
294              assertTrue(q.remove(i));
295              assertFalse(q.contains(i));
296 <            assertTrue(q.contains(i-1));
296 >            assertTrue(q.contains(i - 1));
297          }
298          for (int i = 0; i < SIZE; i += 2) {
299              assertTrue(q.contains(i));
300              assertTrue(q.remove(i));
301              assertFalse(q.contains(i));
302 <            assertFalse(q.remove(i+1));
303 <            assertFalse(q.contains(i+1));
302 >            assertFalse(q.remove(i + 1));
303 >            assertFalse(q.contains(i + 1));
304          }
305          assertTrue(q.isEmpty());
306      }
# Line 691 | Line 698 | public class ConcurrentSkipListSetTest e
698      }
699  
700      static NavigableSet<Integer> newSet(Class cl) throws Exception {
701 <        NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance();
701 >        NavigableSet<Integer> result =
702 >            (NavigableSet<Integer>) cl.getConstructor().newInstance();
703          assertEquals(0, result.size());
704          assertFalse(result.iterator().hasNext());
705          return result;
# Line 974 | Line 982 | public class ConcurrentSkipListSetTest e
982      }
983  
984      static boolean eq(Integer i, int j) {
985 <        return i == null ? j == -1 : i == j;
985 >        return (i == null) ? j == -1 : i == j;
986      }
987  
988   }

Diff Legend

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