ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/PriorityBlockingQueueTest.java

Comparing jsr166/src/test/tck/PriorityBlockingQueueTest.java (file contents):
Revision 1.13 by jsr166, Mon Nov 16 04:57:10 2009 UTC vs.
Revision 1.14 by jsr166, Mon Nov 16 05:30:08 2009 UTC

#	Line 305 | Line 305 | public class PriorityBlockingQueueTest e
305		q.put(null);
306		shouldThrow();
307		}
308	<	catch (NullPointerException success){
308	>	catch (NullPointerException success) {
309		}
310		}
311
#	Line 354 | Line 354 | public class PriorityBlockingQueueTest e
354		q.take();
355		t.interrupt();
356		t.join();
357	<	} catch (Exception e){
357	>	} catch (Exception e) {
358		unexpectedException();
359		}
360		}
#	Line 380 | Line 380 | public class PriorityBlockingQueueTest e
380		Thread.sleep(SMALL_DELAY_MS);
381		t.interrupt();
382		t.join();
383	<	} catch (Exception e){
383	>	} catch (Exception e) {
384		unexpectedException();
385		}
386		}
#	Line 394 | Line 394 | public class PriorityBlockingQueueTest e
394		for (int i = 0; i < SIZE; ++i) {
395		assertEquals(i, ((Integer)q.take()).intValue());
396		}
397	<	} catch (InterruptedException e){
397	>	} catch (InterruptedException e) {
398		unexpectedException();
399		}
400		}
#	Line 409 | Line 409 | public class PriorityBlockingQueueTest e
409		try {
410		q.take();
411		threadShouldThrow();
412	<	} catch (InterruptedException success){ }
412	>	} catch (InterruptedException success) { }
413		}
414		});
415		try {
#	Line 417 | Line 417 | public class PriorityBlockingQueueTest e
417		Thread.sleep(SHORT_DELAY_MS);
418		t.interrupt();
419		t.join();
420	<	} catch (Exception e){
420	>	} catch (Exception e) {
421		unexpectedException();
422		}
423		}
#	Line 435 | Line 435 | public class PriorityBlockingQueueTest e
435		}
436		q.take();
437		threadShouldThrow();
438	<	} catch (InterruptedException success){
438	>	} catch (InterruptedException success) {
439		}
440		}});
441		t.start();
#	Line 471 | Line 471 | public class PriorityBlockingQueueTest e
471		assertEquals(i, ((Integer)q.poll(0, TimeUnit.MILLISECONDS)).intValue());
472		}
473		assertNull(q.poll(0, TimeUnit.MILLISECONDS));
474	<	} catch (InterruptedException e){
474	>	} catch (InterruptedException e) {
475		unexpectedException();
476		}
477		}
#	Line 486 | Line 486 | public class PriorityBlockingQueueTest e
486		assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
487		}
488		assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
489	<	} catch (InterruptedException e){
489	>	} catch (InterruptedException e) {
490		unexpectedException();
491		}
492		}
#	Line 504 | Line 504 | public class PriorityBlockingQueueTest e
504		threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
505		}
506		threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
507	<	} catch (InterruptedException success){
507	>	} catch (InterruptedException success) {
508		}
509		}});
510		t.start();
#	Line 540 | Line 540 | public class PriorityBlockingQueueTest e
540		assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
541		t.interrupt();
542		t.join();
543	<	} catch (Exception e){
543	>	} catch (Exception e) {
544		unexpectedException();
545		}
546		}
#	Line 587 | Line 587 | public class PriorityBlockingQueueTest e
587		try {
588		q.remove();
589		shouldThrow();
590	<	} catch (NoSuchElementException success){
590	>	} catch (NoSuchElementException success) {
591		}
592		}
593
#	Line 692 | Line 692 | public class PriorityBlockingQueueTest e
692		try {
693		for (int i = 0; i < o.length; i++)
694		assertEquals(o[i], q.take());
695	<	} catch (InterruptedException e){
695	>	} catch (InterruptedException e) {
696		unexpectedException();
697		}
698		}
#	Line 708 | Line 708 | public class PriorityBlockingQueueTest e
708		try {
709		for (int i = 0; i < ints.length; i++)
710		assertEquals(ints[i], q.take());
711	<	} catch (InterruptedException e){
711	>	} catch (InterruptedException e) {
712		unexpectedException();
713		}
714		}
#	Line 721 | Line 721 | public class PriorityBlockingQueueTest e
721		PriorityBlockingQueue q = populatedQueue(SIZE);
722		Object o[] = q.toArray(null);
723		shouldThrow();
724	<	} catch (NullPointerException success){}
724	>	} catch (NullPointerException success) {}
725		}
726
727		/**
#	Line 732 | Line 732 | public class PriorityBlockingQueueTest e
732		PriorityBlockingQueue q = populatedQueue(SIZE);
733		Object o[] = q.toArray(new String[10] );
734		shouldThrow();
735	<	} catch (ArrayStoreException  success){}
735	>	} catch (ArrayStoreException  success) {}
736		}
737
738		/**
#	Line 831 | Line 831 | public class PriorityBlockingQueueTest e
831		assertEquals(q.size(), r.size());
832		while (!q.isEmpty())
833		assertEquals(q.remove(), r.remove());
834	<	} catch (Exception e){
834	>	} catch (Exception e) {
835		unexpectedException();
836		}
837		}
#	Line 903 | Line 903 | public class PriorityBlockingQueueTest e
903		assertEquals(l.get(i), new Integer(i));
904		t.join();
905		assertTrue(q.size() + l.size() >= SIZE);
906	<	} catch (Exception e){
906	>	} catch (Exception e) {
907		unexpectedException();
908		}
909		}

Diff Legend

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