=tck remove not used assertion method which could lead to NPE

Author: ktoso

tck/src/main/java/org/reactivestreams/tck/TestEnvironment.java

@@ -12,7 +12,6 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static org.reactivestreams.tck.support.NonFatal.isNonFatal;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
@@ -77,31 +76,25 @@ public void flop(Throwable thr, String msg) {
   }
 
 
-  public <T extends Throwable> Throwable expectThrowingOf(Class<T> clazz, String errorMsg, Runnable block) throws Throwable {
+  public <T extends Throwable> void expectThrowingOfWithMessage(Class<T> clazz, String requiredMessagePart, Runnable block) throws Throwable {
+    String errorMsg = String.format("Expected [%s] to be thrown", clazz);
+
     try {
       block.run();
-      flop(errorMsg);
+      throw new AssertionError("Expected " + clazz.getCanonicalName() + ", yet no exception was thrown!");
     } catch (Throwable e) {
       if (clazz.isInstance(e)) {
         // ok
-        return e;
-      } else if (isNonFatal(e)) {
-        flop(errorMsg + " but was: " + e);
+        String message = e.getMessage();
+        assertTrue(message.contains(requiredMessagePart),
+                   String.format("Got expected exception [%s] but missing message part [%s], was: %s", e.getClass(), requiredMessagePart, message));
       } else {
-        throw e;
+        String msg = errorMsg + " but was: " + e;
+        flop(e, msg);
+        throw new AssertionError(msg); // would love to include the `e` cause, but that constructor is Java 7+
       }
     }
 
-    // make compiler happy
-    return null;
-  }
-
-  @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
-  public <T extends Throwable> void expectThrowingOfWithMessage(Class<T> clazz, String requiredMessagePart, Runnable block) throws Throwable {
-    Throwable err = expectThrowingOf(clazz, String.format("Expected [%s] to be thrown", clazz), block);
-    String message = err.getMessage();
-    assertTrue(message.contains(requiredMessagePart),
-               String.format("Got expected exception [%s] but missing message part [%s], was: %s", err.getClass(), requiredMessagePart, message));
   }
 
   public <T extends Throwable> void assertAsyncErrorWithMessage(Class<T> clazz, String requiredMessagePart) throws Throwable {

tck/src/test/java/org/reactivestreams/tck/TestEnvironmentTest.java

@@ -0,0 +1,54 @@
+package org.reactivestreams.tck;
+
+import org.testng.annotations.Test;
+
+public class TestEnvironmentTest {
+
+  final TestEnvironment env = new TestEnvironment(100);
+
+  @Test
+  public void assertAsyncErrorWithMessage_shouldNotThrowWhenExpectedException() throws Throwable {
+    env.flop(new ExampleException("3.17"), "boom");
+
+    env.assertAsyncErrorWithMessage(ExampleException.class, "3.17");
+  }
+
+  @Test(expectedExceptions = AssertionError.class)
+  public void assertAsyncErrorWithMessage_shouldThrowWhenExceptionHasMissingText() throws Throwable {
+    env.flop(new ExampleException("3.17"), "boom");
+
+    env.assertAsyncErrorWithMessage(ExampleException.class, "wat");
+  }
+
+  @Test
+  public void expectThrowingOfWithMessage_shouldNotThrowWhenExpectedExceptionThrown() throws Throwable {
+    env.expectThrowingOfWithMessage(ExampleException.class, "3.17", new Runnable() {
+      @Override public void run() {
+        throw new ExampleException("3.17");
+      }
+    });
+  }
+
+  @Test(expectedExceptions = AssertionError.class)
+  public void expectThrowingOfWithMessage_shouldThrowWhenExpectedExceptionHasMissingText() throws Throwable {
+    env.expectThrowingOfWithMessage(ExampleException.class, "3.17", new Runnable() {
+      @Override public void run() {
+        throw new ExampleException("3");
+      }
+    });
+  }
+
+  @Test(expectedExceptions = AssertionError.class)
+  public void expectThrowingOfWithMessage_shouldThrowWhenNoExceptionWasThrown() throws Throwable {
+    env.expectThrowingOfWithMessage(ExampleException.class, "3.17", new Runnable() {
+      @Override public void run() {
+      }
+    });
+  }
+}
+
+final class ExampleException extends RuntimeException {
+  public ExampleException(String message) {
+    super(message);
+  }
+}

tck/src/test/resources/testng.yaml

@@ -5,3 +5,4 @@ tests:
   - name: TCK
     classes:
       - org.reactivestreams.tck.IdentityProcessorVerificationDelegationTest
+      - org.reactivestreams.tck.TestEnvironmentTest