--- jsr166/src/test/tck/SubmissionPublisherTest.java 2015/09/07 17:14:06 1.1 +++ jsr166/src/test/tck/SubmissionPublisherTest.java 2015/09/07 20:53:10 1.6 @@ -45,19 +45,19 @@ public class SubmissionPublisherTest ext return t; } } - + static final Executor basicExecutor = (ForkJoinPool.getCommonPoolParallelism() > 0) ? ForkJoinPool.commonPool() : new ThreadPoolExecutor(1, 1, 60, SECONDS, new LinkedBlockingQueue(), new DaemonThreadFactory()); - + static SubmissionPublisher basicPublisher() { return new SubmissionPublisher(basicExecutor, Flow.defaultBufferSize()); } - + static class SPException extends RuntimeException {} class TestSubscriber implements Subscriber { @@ -153,15 +153,15 @@ public class SubmissionPublisherTest ext */ void checkInitialState(SubmissionPublisher p) { assertFalse(p.hasSubscribers()); - assertEquals(p.getNumberOfSubscribers(), 0); + assertEquals(0, p.getNumberOfSubscribers()); assertTrue(p.getSubscribers().isEmpty()); assertFalse(p.isClosed()); assertNull(p.getClosedException()); int n = p.getMaxBufferCapacity(); assertTrue((n & (n - 1)) == 0); // power of two assertNotNull(p.getExecutor()); - assertEquals(p.estimateMinimumDemand(), 0); - assertEquals(p.estimateMaximumLag(), 0); + assertEquals(0, p.estimateMinimumDemand()); + assertEquals(0, p.estimateMaximumLag()); } /** @@ -185,7 +185,7 @@ public class SubmissionPublisherTest ext SubmissionPublisher p = new SubmissionPublisher(e, 8); checkInitialState(p); assertSame(p.getExecutor(), e); - assertEquals(p.getMaxBufferCapacity(), 8); + assertEquals(8, p.getMaxBufferCapacity()); } /** @@ -193,10 +193,9 @@ public class SubmissionPublisherTest ext */ public void testConstructor3() { try { - SubmissionPublisher p = new SubmissionPublisher(null, 8); + new SubmissionPublisher(null, 8); shouldThrow(); - } catch (NullPointerException success) { - } + } catch (NullPointerException success) {} } /** @@ -206,10 +205,9 @@ public class SubmissionPublisherTest ext public void testConstructor4() { Executor e = Executors.newFixedThreadPool(1); try { - SubmissionPublisher p = new SubmissionPublisher(e, -1); + new SubmissionPublisher(e, -1); shouldThrow(); - } catch (IllegalArgumentException success) { - } + } catch (IllegalArgumentException success) {} } /** @@ -226,9 +224,7 @@ public class SubmissionPublisherTest ext try { p.submit(1); shouldThrow(); - } - catch(IllegalStateException success) { - } + } catch (IllegalStateException success) {} Throwable ex = new SPException(); p.closeExceptionally(ex); assertTrue(p.isClosed()); @@ -251,9 +247,7 @@ public class SubmissionPublisherTest ext try { p.submit(1); shouldThrow(); - } - catch(IllegalStateException success) { - } + } catch (IllegalStateException success) {} p.close(); assertTrue(p.isClosed()); assertSame(p.getClosedException(), ex); @@ -270,27 +264,27 @@ public class SubmissionPublisherTest ext SubmissionPublisher p = basicPublisher(); p.subscribe(s); assertTrue(p.hasSubscribers()); - assertEquals(p.getNumberOfSubscribers(), 1); + assertEquals(1, p.getNumberOfSubscribers()); assertTrue(p.getSubscribers().contains(s)); assertTrue(p.isSubscribed(s)); s.awaitSubscribe(); assertNotNull(s.sn); - assertEquals(s.nexts, 0); - assertEquals(s.errors, 0); - assertEquals(s.completes, 0); + assertEquals(0, s.nexts); + assertEquals(0, s.errors); + assertEquals(0, s.completes); TestSubscriber s2 = new TestSubscriber(); p.subscribe(s2); assertTrue(p.hasSubscribers()); - assertEquals(p.getNumberOfSubscribers(), 2); + assertEquals(2, p.getNumberOfSubscribers()); assertTrue(p.getSubscribers().contains(s)); assertTrue(p.getSubscribers().contains(s2)); assertTrue(p.isSubscribed(s)); assertTrue(p.isSubscribed(s2)); s2.awaitSubscribe(); assertNotNull(s2.sn); - assertEquals(s2.nexts, 0); - assertEquals(s2.errors, 0); - assertEquals(s2.completes, 0); + assertEquals(0, s2.nexts); + assertEquals(0, s2.errors); + assertEquals(0, s2.completes); } /** @@ -303,9 +297,9 @@ public class SubmissionPublisherTest ext p.close(); p.subscribe(s); s.awaitComplete(); - assertEquals(s.nexts, 0); - assertEquals(s.errors, 0); - assertEquals(s.completes, 1); + assertEquals(0, s.nexts); + assertEquals(0, s.errors); + assertEquals(1, s.completes, 1); } /** @@ -321,8 +315,8 @@ public class SubmissionPublisherTest ext assertSame(p.getClosedException(), ex); p.subscribe(s); s.awaitError(); - assertEquals(s.nexts, 0); - assertEquals(s.errors, 1); + assertEquals(0, s.nexts); + assertEquals(1, s.errors); } /** @@ -334,18 +328,18 @@ public class SubmissionPublisherTest ext SubmissionPublisher p = basicPublisher(); p.subscribe(s); assertTrue(p.hasSubscribers()); - assertEquals(p.getNumberOfSubscribers(), 1); + assertEquals(1, p.getNumberOfSubscribers()); assertTrue(p.getSubscribers().contains(s)); assertTrue(p.isSubscribed(s)); s.awaitSubscribe(); assertNotNull(s.sn); - assertEquals(s.nexts, 0); - assertEquals(s.errors, 0); - assertEquals(s.completes, 0); + assertEquals(0, s.nexts); + assertEquals(0, s.errors); + assertEquals(0, s.completes); p.subscribe(s); s.awaitError(); - assertEquals(s.nexts, 0); - assertEquals(s.errors, 1); + assertEquals(0, s.nexts); + assertEquals(1, s.errors); assertFalse(p.isSubscribed(s)); } @@ -358,12 +352,11 @@ public class SubmissionPublisherTest ext s.throwOnCall = true; try { p.subscribe(s); - } catch(Exception ok) { - } + } catch (Exception ok) {} s.awaitError(); - assertEquals(s.nexts, 0); - assertEquals(s.errors, 1); - assertEquals(s.completes, 0); + assertEquals(0, s.nexts); + assertEquals(1, s.errors); + assertEquals(0, s.completes); } /** @@ -373,8 +366,8 @@ public class SubmissionPublisherTest ext SubmissionPublisher p = basicPublisher(); try { p.subscribe(null); - } catch(NullPointerException success) { - } + shouldThrow(); + } catch (NullPointerException success) {} checkInitialState(p); } @@ -392,11 +385,11 @@ public class SubmissionPublisherTest ext assertTrue(p.isClosed()); assertNull(p.getClosedException()); s1.awaitComplete(); - assertEquals(s1.nexts, 1); - assertEquals(s1.completes, 1); + assertEquals(1, s1.nexts); + assertEquals(1, s1.completes); s2.awaitComplete(); - assertEquals(s2.nexts, 1); - assertEquals(s2.completes, 1); + assertEquals(1, s2.nexts); + assertEquals(1, s2.completes); } /** @@ -413,10 +406,10 @@ public class SubmissionPublisherTest ext assertTrue(p.isClosed()); s1.awaitError(); assertTrue(s1.nexts <= 1); - assertEquals(s1.errors, 1); + assertEquals(1, s1.errors); s2.awaitError(); assertTrue(s2.nexts <= 1); - assertEquals(s2.errors, 1); + assertEquals(1, s2.errors); } /** @@ -435,8 +428,8 @@ public class SubmissionPublisherTest ext p.submit(i); p.close(); s2.awaitComplete(); - assertEquals(s2.nexts, 20); - assertEquals(s2.completes, 1); + assertEquals(20, s2.nexts); + assertEquals(1, s2.completes); assertTrue(s1.nexts < 20); assertFalse(p.isSubscribed(s1)); } @@ -456,9 +449,9 @@ public class SubmissionPublisherTest ext p.submit(2); p.close(); s2.awaitComplete(); - assertEquals(s2.nexts, 2); + assertEquals(2, s2.nexts); s1.awaitComplete(); - assertEquals(s1.errors, 1); + assertEquals(1, s1.errors); } /** @@ -480,11 +473,11 @@ public class SubmissionPublisherTest ext p.submit(2); p.close(); s2.awaitComplete(); - assertEquals(s2.nexts, 2); - assertEquals(s2.completes, 1); + assertEquals(2, s2.nexts); + assertEquals(1, s2.completes); s1.awaitError(); - assertEquals(s1.errors, 1); - assertEquals(calls.get(), 1); + assertEquals(1, s1.errors); + assertEquals(1, calls.get()); } /** @@ -501,10 +494,10 @@ public class SubmissionPublisherTest ext p.close(); s2.awaitComplete(); s1.awaitComplete(); - assertEquals(s2.nexts, 20); - assertEquals(s2.completes, 1); - assertEquals(s1.nexts, 20); - assertEquals(s1.completes, 1); + assertEquals(20, s2.nexts); + assertEquals(1, s2.completes); + assertEquals(20, s1.nexts); + assertEquals(1, s1.completes); } /** @@ -522,16 +515,16 @@ public class SubmissionPublisherTest ext p.submit(1); p.submit(2); s2.awaitNext(1); - assertEquals(s1.nexts, 0); + assertEquals(0, s1.nexts); s1.sn.request(3); p.submit(3); p.close(); s2.awaitComplete(); - assertEquals(s2.nexts, 3); - assertEquals(s2.completes, 1); + assertEquals(3, s2.nexts); + assertEquals(1, s2.completes); s1.awaitComplete(); assertTrue(s1.nexts > 0); - assertEquals(s1.completes, 1); + assertEquals(1, s1.completes); } /** @@ -550,10 +543,10 @@ public class SubmissionPublisherTest ext p.submit(2); p.close(); s2.awaitComplete(); - assertEquals(s2.nexts, 2); - assertEquals(s2.completes, 1); + assertEquals(2, s2.nexts); + assertEquals(1, s2.completes); s1.awaitNext(1); - assertEquals(s1.nexts, 1); + assertEquals(1, s1.nexts); } /** @@ -572,10 +565,10 @@ public class SubmissionPublisherTest ext p.submit(2); p.close(); s2.awaitComplete(); - assertEquals(s2.nexts, 2); - assertEquals(s2.completes, 1); + assertEquals(2, s2.nexts); + assertEquals(1, s2.completes); s1.awaitError(); - assertEquals(s1.errors, 1); + assertEquals(1, s1.errors); assertTrue(s1.lastError instanceof IllegalArgumentException); } @@ -589,35 +582,35 @@ public class SubmissionPublisherTest ext s.request = false; p.subscribe(s); s.awaitSubscribe(); - assertEquals(p.estimateMinimumDemand(), 0); + assertEquals(0, p.estimateMinimumDemand()); s.sn.request(1); - assertEquals(p.estimateMinimumDemand(), 1); + assertEquals(1, p.estimateMinimumDemand()); p.submit(1); s.awaitNext(1); - assertEquals(p.estimateMinimumDemand(), 0); + assertEquals(0, p.estimateMinimumDemand()); } /** - * Submit to a publisher with no subscribers returns lag 0 + * submit to a publisher with no subscribers returns lag 0 */ public void testEmptySubmit() { SubmissionPublisher p = basicPublisher(); - assertEquals(p.submit(1), 0); + assertEquals(0, p.submit(1)); } /** - * Submit(null) throws NPE + * submit(null) throws NPE */ public void testNullSubmit() { SubmissionPublisher p = basicPublisher(); try { p.submit(null); - } catch (NullPointerException success) { - } + shouldThrow(); + } catch (NullPointerException success) {} } /** - * Submit returns number of lagged items, compatible with result + * submit returns number of lagged items, compatible with result * of estimateMaximumLag. */ public void testLaggedSubmit() { @@ -630,7 +623,7 @@ public class SubmissionPublisherTest ext p.subscribe(s2); s2.awaitSubscribe(); s1.awaitSubscribe(); - assertEquals(p.submit(1), 1); + assertEquals(1, p.submit(1)); assertTrue(p.estimateMaximumLag() >= 1); assertTrue(p.submit(2) >= 2); assertTrue(p.estimateMaximumLag() >= 2); @@ -641,9 +634,9 @@ public class SubmissionPublisherTest ext p.submit(4); p.close(); s2.awaitComplete(); - assertEquals(s2.nexts, 4); + assertEquals(4, s2.nexts); s1.awaitComplete(); - assertEquals(s2.nexts, 4); + assertEquals(4, s2.nexts); } /** @@ -663,12 +656,12 @@ public class SubmissionPublisherTest ext p.close(); s2.awaitComplete(); s1.awaitComplete(); - assertEquals(s2.nexts, 20); - assertEquals(s2.completes, 1); - assertEquals(s1.nexts, 20); - assertEquals(s1.completes, 1); + assertEquals(20, s2.nexts); + assertEquals(1, s2.completes); + assertEquals(20, s1.nexts); + assertEquals(1, s1.completes); } - + static boolean noopHandle(AtomicInteger count) { count.getAndIncrement(); return false; @@ -681,26 +674,26 @@ public class SubmissionPublisherTest ext } /** - * Offer to a publisher with no subscribers returns lag 0 + * offer to a publisher with no subscribers returns lag 0 */ public void testEmptyOffer() { SubmissionPublisher p = basicPublisher(); - assertEquals(p.offer(1, null), 0); + assertEquals(0, p.offer(1, null)); } /** - * Offer(null) throws NPE + * offer(null) throws NPE */ public void testNullOffer() { SubmissionPublisher p = basicPublisher(); try { p.offer(null, null); - } catch (NullPointerException success) { - } + shouldThrow(); + } catch (NullPointerException success) {} } /** - * Offer returns number of lagged items if not saturated + * offer returns number of lagged items if not saturated */ public void testLaggedOffer() { SubmissionPublisher p = basicPublisher(); @@ -720,13 +713,13 @@ public class SubmissionPublisherTest ext p.offer(4, null); p.close(); s2.awaitComplete(); - assertEquals(s2.nexts, 4); + assertEquals(4, s2.nexts); s1.awaitComplete(); - assertEquals(s2.nexts, 4); + assertEquals(4, s2.nexts); } /** - * Offer reports drops if saturated + * offer reports drops if saturated */ public void testDroppedOffer() { SubmissionPublisher p = new SubmissionPublisher( @@ -754,7 +747,7 @@ public class SubmissionPublisherTest ext } /** - * Offer invokes drop handler if saturated + * offer invokes drop handler if saturated */ public void testHandledDroppedOffer() { AtomicInteger calls = new AtomicInteger(); @@ -781,9 +774,8 @@ public class SubmissionPublisherTest ext assertTrue(calls.get() >= 4); } - /** - * Offer succeeds if drop handler forces request + * offer succeeds if drop handler forces request */ public void testRecoveredHandledDroppedOffer() { AtomicInteger calls = new AtomicInteger(); @@ -805,36 +797,35 @@ public class SubmissionPublisherTest ext p.close(); s2.awaitComplete(); s1.awaitComplete(); - assertEquals(s1.nexts + s2.nexts, n); + assertEquals(n, s1.nexts + s2.nexts); assertTrue(calls.get() >= 2); } - /** - * TimedOffer to a publisher with no subscribers returns lag 0 + * Timed offer to a publisher with no subscribers returns lag 0 */ public void testEmptyTimedOffer() { SubmissionPublisher p = basicPublisher(); - assertEquals(p.offer(1, null), 0); + assertEquals(0, p.offer(1, LONG_DELAY_MS, MILLISECONDS, null)); } /** - * Timed Offer with null item or TimeUnit throws NPE + * Timed offer with null item or TimeUnit throws NPE */ public void testNullTimedOffer() { SubmissionPublisher p = basicPublisher(); try { p.offer(null, SHORT_DELAY_MS, MILLISECONDS, null); - } catch (NullPointerException success) { - } + shouldThrow(); + } catch (NullPointerException success) {} try { p.offer(1, SHORT_DELAY_MS, null, null); - } catch (NullPointerException success) { - } + shouldThrow(); + } catch (NullPointerException success) {} } /** - * Timed Offer returns number of lagged items if not saturated + * Timed offer returns number of lagged items if not saturated */ public void testLaggedTimedOffer() { SubmissionPublisher p = basicPublisher(); @@ -854,13 +845,13 @@ public class SubmissionPublisherTest ext p.offer(4, SHORT_DELAY_MS, MILLISECONDS, null); p.close(); s2.awaitComplete(); - assertEquals(s2.nexts, 4); + assertEquals(4, s2.nexts); s1.awaitComplete(); - assertEquals(s2.nexts, 4); + assertEquals(4, s2.nexts); } /** - * Timed Offer reports drops if saturated + * Timed offer reports drops if saturated */ public void testDroppedTimedOffer() { SubmissionPublisher p = new SubmissionPublisher( @@ -888,7 +879,7 @@ public class SubmissionPublisherTest ext } /** - * Timed Offer invokes drop handler if saturated + * Timed offer invokes drop handler if saturated */ public void testHandledDroppedTimedOffer() { AtomicInteger calls = new AtomicInteger(); @@ -916,7 +907,7 @@ public class SubmissionPublisherTest ext } /** - * Timed Offer succeeds if drop handler forces request + * Timed offer succeeds if drop handler forces request */ public void testRecoveredHandledDroppedTimedOffer() { AtomicInteger calls = new AtomicInteger(); @@ -938,9 +929,8 @@ public class SubmissionPublisherTest ext p.close(); s2.awaitComplete(); s1.awaitComplete(); - assertEquals(s1.nexts + s2.nexts, n); + assertEquals(n, s1.nexts + s2.nexts); assertTrue(calls.get() >= 2); } - }