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

Comparing jsr166/src/test/tck/CountedCompleterTest.java (file contents):
Revision 1.19 by jsr166, Sun Oct 4 18:40:57 2015 UTC vs.
Revision 1.23 by jsr166, Sun Oct 18 19:12:45 2015 UTC

# Line 93 | Line 93 | public class CountedCompleterTest extend
93  
94          {
95              Thread.currentThread().interrupt();
96 <            long t0 = System.nanoTime();
96 >            long startTime = System.nanoTime();
97              assertNull(a.join());
98 <            assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
98 >            assertTrue(millisElapsedSince(startTime) < SMALL_DELAY_MS);
99              Thread.interrupted();
100          }
101  
102          {
103              Thread.currentThread().interrupt();
104 <            long t0 = System.nanoTime();
104 >            long startTime = System.nanoTime();
105              a.quietlyJoin();        // should be no-op
106 <            assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
106 >            assertTrue(millisElapsedSince(startTime) < SMALL_DELAY_MS);
107              Thread.interrupted();
108          }
109  
# Line 136 | Line 136 | public class CountedCompleterTest extend
136          Thread.interrupted();
137  
138          {
139 <            long t0 = System.nanoTime();
139 >            long startTime = System.nanoTime();
140              a.quietlyJoin();        // should be no-op
141 <            assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
141 >            assertTrue(millisElapsedSince(startTime) < SMALL_DELAY_MS);
142          }
143  
144          try {
# Line 174 | Line 174 | public class CountedCompleterTest extend
174          Thread.interrupted();
175  
176          {
177 <            long t0 = System.nanoTime();
177 >            long startTime = System.nanoTime();
178              a.quietlyJoin();        // should be no-op
179 <            assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
179 >            assertTrue(millisElapsedSince(startTime) < SMALL_DELAY_MS);
180          }
181  
182          try {
# Line 278 | Line 278 | public class CountedCompleterTest extend
278      final class NoopCC extends CheckedCC {
279          NoopCC() { super(); }
280          NoopCC(CountedCompleter p) { super(p); }
281 +        NoopCC(CountedCompleter p, int initialPendingCount) {
282 +            super(p, initialPendingCount);
283 +        }
284          protected void realCompute() {}
285      }
286  
# Line 296 | Line 299 | public class CountedCompleterTest extend
299      void testComplete(NoopCC cc, Object x, int pendingCount) {
300          cc.setPendingCount(pendingCount);
301          cc.checkCompletes(x);
302 +        assertEquals(pendingCount, cc.getPendingCount());
303      }
304  
305      /**
# Line 309 | Line 313 | public class CountedCompleterTest extend
313      }
314  
315      /**
316 <     * completeExceptionally(null) throws NullPointerException
316 >     * completeExceptionally(null) surprisingly has the same effect as
317 >     * completeExceptionally(new RuntimeException())
318       */
319      public void testCompleteExceptionally_null() {
320 +        NoopCC a = new NoopCC();
321 +        a.completeExceptionally(null);
322          try {
323 <            new NoopCC()
317 <                .checkCompletesExceptionally(null);
323 >            a.invoke();
324              shouldThrow();
325 <        } catch (NullPointerException success) {}
325 >        } catch (RuntimeException success) {
326 >            assertSame(success.getClass(), RuntimeException.class);
327 >            assertNull(success.getCause());
328 >            a.checkCompletedExceptionally(success);
329 >        }
330      }
331  
332      /**
# Line 347 | Line 357 | public class CountedCompleterTest extend
357       * decrementPendingCountUnlessZero decrements reported pending
358       * count unless zero
359       */
360 <    public void testDecrementPendingCount() {
361 <        NoopCC a = new NoopCC();
362 <        assertEquals(0, a.getPendingCount());
363 <        a.addToPendingCount(1);
360 >    public void testDecrementPendingCountUnlessZero() {
361 >        NoopCC a = new NoopCC(null, 2);
362 >        assertEquals(2, a.getPendingCount());
363 >        assertEquals(2, a.decrementPendingCountUnlessZero());
364          assertEquals(1, a.getPendingCount());
365 <        a.decrementPendingCountUnlessZero();
365 >        assertEquals(1, a.decrementPendingCountUnlessZero());
366          assertEquals(0, a.getPendingCount());
367 <        a.decrementPendingCountUnlessZero();
367 >        assertEquals(0, a.decrementPendingCountUnlessZero());
368          assertEquals(0, a.getPendingCount());
369 +        a.setPendingCount(-1);
370 +        assertEquals(-1, a.decrementPendingCountUnlessZero());
371 +        assertEquals(-2, a.getPendingCount());
372      }
373  
374      /**

Diff Legend

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