=tck #384 check for alternative wordings in messages when checking 3.9

Author: ktoso

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

@@ -896,7 +896,8 @@ public void required_spec309_requestZeroMustSignalIllegalArgumentException() thr
       @Override public void run(Publisher<T> pub) throws Throwable {
         final ManualSubscriber<T> sub = env.newManualSubscriber(pub);
         sub.request(0);
-        sub.expectErrorWithMessage(IllegalArgumentException.class, "3.9"); // we do require implementations to mention the rule number at the very least
+        // we do require implementations to mention the rule number at the very least, or mentioning that the non-negative request is the problem
+        sub.expectErrorWithMessage(IllegalArgumentException.class, Arrays.asList("3.9", "non-positive subscription request", "zero subscription request"));
       }
     });
   }
@@ -909,7 +910,8 @@ public void run(Publisher<T> pub) throws Throwable {
         final ManualSubscriber<T> sub = env.newManualSubscriber(pub);
         final Random r = new Random();
         sub.request(-r.nextInt(Integer.MAX_VALUE) - 1);
-        sub.expectErrorWithMessage(IllegalArgumentException.class, "3.9"); // we do require implementations to mention the rule number at the very least
+        // we do require implementations to mention the rule number at the very least, or mentioning that the non-negative request is the problem
+        sub.expectErrorWithMessage(IllegalArgumentException.class, Arrays.asList("3.9", "non-positive subscription request", "negative subscription request")); 
       }
     });
   }

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

@@ -17,6 +17,7 @@
 import org.reactivestreams.tck.support.SubscriberBufferOverflowException;
 import org.reactivestreams.tck.support.Optional;
 
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.ArrayBlockingQueue;
@@ -513,14 +514,24 @@ public void expectCompletion(long timeoutMillis, String errorMsg) throws Interru
     public <E extends Throwable> void expectErrorWithMessage(Class<E> expected, String requiredMessagePart) throws Exception {
       expectErrorWithMessage(expected, requiredMessagePart, env.defaultTimeoutMillis());
     }
+    public <E extends Throwable> void expectErrorWithMessage(Class<E> expected, List<String> requiredMessagePartAlternatives) throws Exception {
+      expectErrorWithMessage(expected, requiredMessagePartAlternatives, env.defaultTimeoutMillis());
+    }
 
     @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
     public <E extends Throwable> void expectErrorWithMessage(Class<E> expected, String requiredMessagePart, long timeoutMillis) throws Exception {
+      expectErrorWithMessage(expected, Collections.singletonList(requiredMessagePart), timeoutMillis);
+    }
+    public <E extends Throwable> void expectErrorWithMessage(Class<E> expected, List<String> requiredMessagePartAlternatives, long timeoutMillis) throws Exception {
       final E err = expectError(expected, timeoutMillis);
       final String message = err.getMessage();
-      assertTrue(message.contains(requiredMessagePart),
+      
+      boolean contains = false;
+      for (String requiredMessagePart : requiredMessagePartAlternatives) 
+        if (message.contains(requiredMessagePart)) contains = true; // not short-circuting loop, it is expected to
+      assertTrue(contains,
                  String.format("Got expected exception [%s] but missing message part [%s], was: %s",
-                               err.getClass(), requiredMessagePart, err.getMessage()));
+                               err.getClass(), "anyOf: " + requiredMessagePartAlternatives, err.getMessage()));
     }
 
     public <E extends Throwable> E expectError(Class<E> expected) throws Exception {

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

@@ -481,6 +481,26 @@ public void required_spec309_requestZeroMustSignalIllegalArgumentException_shoul
     }, "Expected onError");
   }
 
+  @Test
+  public void required_spec309_requestZeroMustSignalIllegalArgumentException_shouldPassWhenFailureIncludesNonPositiveWording() throws Throwable {
+    customPublisherVerification(new Publisher<Integer>() {
+      @Override
+      public void subscribe(final Subscriber<? super Integer> s) {
+        s.onSubscribe(new Subscription() {
+          @Override
+          public void request(long n) {
+            if (n <= 0) s.onError(new IllegalArgumentException("non-positive subscription request detected, which is illegal!"));
+          }
+
+          @Override
+          public void cancel() {
+            // noop
+          }
+        });
+      }
+    }).required_spec309_requestZeroMustSignalIllegalArgumentException();
+  }
+
   @Test
   public void required_spec309_requestNegativeNumberMustSignalIllegalArgumentException_shouldFailBy_expectingOnError() throws Throwable {
     requireTestFailure(new ThrowingRunnable() {
@@ -490,6 +510,26 @@ public void required_spec309_requestNegativeNumberMustSignalIllegalArgumentExcep
     }, "Expected onError");
   }
 
+  @Test
+  public void required_spec309_requestNegativeNumberMustSignalIllegalArgumentException_shouldPassWhenFailureIncludesNonPositiveWording() throws Throwable {
+    customPublisherVerification(new Publisher<Integer>() {
+      @Override
+      public void subscribe(final Subscriber<? super Integer> s) {
+        s.onSubscribe(new Subscription() {
+          @Override
+          public void request(long n) {
+            if (n <= 0) s.onError(new IllegalArgumentException("non-positive subscription request detected, which is illegal!"));
+          }
+
+          @Override
+          public void cancel() {
+            // noop
+          }
+        });
+      }
+    }).required_spec309_requestNegativeNumberMustSignalIllegalArgumentException();
+  }
+
   @Test
   public void required_spec312_cancelMustMakeThePublisherToEventuallyStopSignaling_shouldFailBy_havingEmitedMoreThanRequested() throws Throwable {
     final ExecutorService pool = Executors.newFixedThreadPool(2);