[cvs] / jsr166 / src / test / tck / BlockingQueueTest.java Repository:
ViewVC logotype

Diff of /jsr166/src/test/tck/BlockingQueueTest.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.14, Wed Dec 31 20:09:08 2014 UTC revision 1.20, Sun May 14 14:52:50 2017 UTC
# Line 106  Line 106 
106      }      }
107    
108      /**      /**
109       * put(null) throws NullPointerException       * addAll(null) throws NullPointerException
110       */       */
111      public void testAddAllNull() throws InterruptedException {      public void testAddAllNull() throws InterruptedException {
112          final Collection q = emptyCollection();          final Collection q = emptyCollection();
# Line 235  Line 235 
235                      shouldThrow();                      shouldThrow();
236                  } catch (InterruptedException success) {}                  } catch (InterruptedException success) {}
237                  assertFalse(Thread.interrupted());                  assertFalse(Thread.interrupted());
238    
239                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
240              }});              }});
241    
242          barrier.await();          barrier.await();
# Line 243  Line 245 
245          assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);          assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
246    
247          barrier.await();          barrier.await();
248          assertThreadStaysAlive(t);          assertThreadBlocks(t, Thread.State.TIMED_WAITING);
249          t.interrupt();          t.interrupt();
250          awaitTermination(t);          awaitTermination(t);
251      }      }
# Line 265  Line 267 
267              }});              }});
268    
269          await(threadStarted);          await(threadStarted);
270          assertThreadStaysAlive(t);          assertThreadBlocks(t, Thread.State.WAITING);
271          t.interrupt();          t.interrupt();
272          awaitTermination(t);          awaitTermination(t);
273      }      }
# Line 306  Line 308 
308              }});              }});
309    
310          await(threadStarted);          await(threadStarted);
311          assertThreadStaysAlive(t);          assertThreadBlocks(t, Thread.State.TIMED_WAITING);
312          t.interrupt();          t.interrupt();
313          awaitTermination(t);          awaitTermination(t);
314      }      }

Legend:
Removed from v.1.14  
changed lines
  Added in v.1.20

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8