diff --git a/build.gradle b/build.gradle index b32ba12f..8c9ff84a 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ subprojects { apply plugin: "osgi" group = "org.reactivestreams" - version = "1.0.0.RC2" + version = "1.0.0.RC3.BUILD-SNAPSHOT" sourceCompatibility = 1.6 targetCompatibility = 1.6 diff --git a/tck/src/main/java/org/reactivestreams/tck/SubscriberWhiteboxVerification.java b/tck/src/main/java/org/reactivestreams/tck/SubscriberWhiteboxVerification.java index a7b4b7a8..906bc267 100644 --- a/tck/src/main/java/org/reactivestreams/tck/SubscriberWhiteboxVerification.java +++ b/tck/src/main/java/org/reactivestreams/tck/SubscriberWhiteboxVerification.java @@ -349,11 +349,11 @@ public void required_spec213_onSubscribe_mustThrowNullPointerExceptionWhenParame public void run(WhiteboxTestStage stage) throws Throwable { { - final Subscriber sub = createSubscriber(stage.probe()); + final Subscriber sub = stage.sub(); boolean gotNPE = false; try { sub.onSubscribe(null); - } catch(final NullPointerException expected) { + } catch (final NullPointerException expected) { gotNPE = true; } assertTrue(gotNPE, "onSubscribe(null) did not throw NullPointerException"); @@ -370,17 +370,22 @@ public void required_spec213_onNext_mustThrowNullPointerExceptionWhenParametersA public void run(WhiteboxTestStage stage) throws Throwable { final Subscription subscription = new Subscription() { - @Override public void request(final long elements) {} - @Override public void cancel() {} + @Override + public void request(final long elements) { + } + + @Override + public void cancel() { + } }; { - final Subscriber sub = createSubscriber(stage.probe()); + final Subscriber sub = stage.sub(); boolean gotNPE = false; sub.onSubscribe(subscription); try { sub.onNext(null); - } catch(final NullPointerException expected) { + } catch (final NullPointerException expected) { gotNPE = true; } assertTrue(gotNPE, "onNext(null) did not throw NullPointerException"); @@ -390,7 +395,7 @@ public void run(WhiteboxTestStage stage) throws Throwable { } }); } - + // Verifies rule: https://github.com/reactive-streams/reactive-streams#2.13 @Override @Test public void required_spec213_onError_mustThrowNullPointerExceptionWhenParametersAreNull() throws Throwable { @@ -399,17 +404,22 @@ public void required_spec213_onError_mustThrowNullPointerExceptionWhenParameters public void run(WhiteboxTestStage stage) throws Throwable { final Subscription subscription = new Subscription() { - @Override public void request(final long elements) {} - @Override public void cancel() {} + @Override + public void request(final long elements) { + } + + @Override + public void cancel() { + } }; { - final Subscriber sub = createSubscriber(stage.probe()); + final Subscriber sub = stage.sub(); boolean gotNPE = false; sub.onSubscribe(subscription); try { sub.onError(null); - } catch(final NullPointerException expected) { + } catch (final NullPointerException expected) { gotNPE = true; } assertTrue(gotNPE, "onError(null) did not throw NullPointerException");