--- jsr166/src/test/tck/SubmissionPublisherTest.java	2015/09/07 17:14:06	1.1
+++ jsr166/src/test/tck/SubmissionPublisherTest.java	2015/09/07 20:28:47	1.3
@@ -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<Runnable>(),
                                new DaemonThreadFactory());
-        
+
     static SubmissionPublisher<Integer> basicPublisher() {
         return new SubmissionPublisher<Integer>(basicExecutor,
                                                 Flow.defaultBufferSize());
     }
-    
+
     static class SPException extends RuntimeException {}
 
     class TestSubscriber implements Subscriber<Integer> {
@@ -193,10 +193,9 @@ public class SubmissionPublisherTest ext
      */
     public void testConstructor3() {
         try {
-            SubmissionPublisher<Integer> p = new SubmissionPublisher<Integer>(null, 8);
+            new SubmissionPublisher<Integer>(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<Integer> p = new SubmissionPublisher<Integer>(e, -1);
+            new SubmissionPublisher<Integer>(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);
@@ -358,8 +352,7 @@ 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);
@@ -373,8 +366,8 @@ public class SubmissionPublisherTest ext
         SubmissionPublisher<Integer> p = basicPublisher();
         try {
             p.subscribe(null);
-        } catch(NullPointerException success) {
-        }
+            shouldThrow();
+        } catch (NullPointerException success) {}
         checkInitialState(p);
     }
 
@@ -598,7 +591,7 @@ public class SubmissionPublisherTest ext
     }
 
     /**
-     * Submit to a publisher with no subscribers returns lag 0
+     * submit to a publisher with no subscribers returns lag 0
      */
     public void testEmptySubmit() {
         SubmissionPublisher<Integer> p = basicPublisher();
@@ -606,18 +599,18 @@ public class SubmissionPublisherTest ext
     }
 
     /**
-     * Submit(null) throws NPE
+     * submit(null) throws NPE
      */
     public void testNullSubmit() {
         SubmissionPublisher<Integer> 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() {
@@ -668,7 +661,7 @@ public class SubmissionPublisherTest ext
         assertEquals(s1.nexts, 20);
         assertEquals(s1.completes, 1);
     }
-    
+
     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<Integer> 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<Integer> 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<Integer> p = basicPublisher();
@@ -726,7 +719,7 @@ public class SubmissionPublisherTest ext
     }
 
     /**
-     * Offer reports drops if saturated
+     * offer reports drops if saturated
      */
     public void testDroppedOffer() {
         SubmissionPublisher<Integer> p = new SubmissionPublisher<Integer>(
@@ -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();
@@ -783,7 +776,7 @@ public class SubmissionPublisherTest ext
 
 
     /**
-     * Offer succeeds if drop handler forces request
+     * offer succeeds if drop handler forces request
      */
     public void testRecoveredHandledDroppedOffer() {
         AtomicInteger calls = new AtomicInteger();
@@ -819,22 +812,22 @@ public class SubmissionPublisherTest ext
     }
 
     /**
-     * Timed Offer with null item or TimeUnit throws NPE
+     * Timed offer with null item or TimeUnit throws NPE
      */
     public void testNullTimedOffer() {
         SubmissionPublisher<Integer> 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<Integer> p = basicPublisher();
@@ -860,7 +853,7 @@ public class SubmissionPublisherTest ext
     }
 
     /**
-     * Timed Offer reports drops if saturated
+     * Timed offer reports drops if saturated
      */
     public void testDroppedTimedOffer() {
         SubmissionPublisher<Integer> p = new SubmissionPublisher<Integer>(
@@ -888,7 +881,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 +909,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();