Skip to content

Commit 9c7fdf8

Browse files
committed
Merge pull request reactive-streams#222 from reactive-streams/wip-212-double-subscription-processor-spec-213
fix reactive-streams#212 issue on spec 213 testing wrt Processor
2 parents c576a73 + 6c7ec18 commit 9c7fdf8

File tree

2 files changed

+22
-12
lines changed

2 files changed

+22
-12
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ subprojects {
33
apply plugin: "osgi"
44

55
group = "org.reactivestreams"
6-
version = "1.0.0.RC2"
6+
version = "1.0.0.RC3.BUILD-SNAPSHOT"
77

88
sourceCompatibility = 1.6
99
targetCompatibility = 1.6

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

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -349,11 +349,11 @@ public void required_spec213_onSubscribe_mustThrowNullPointerExceptionWhenParame
349349
public void run(WhiteboxTestStage stage) throws Throwable {
350350

351351
{
352-
final Subscriber<T> sub = createSubscriber(stage.probe());
352+
final Subscriber<? super T> sub = stage.sub();
353353
boolean gotNPE = false;
354354
try {
355355
sub.onSubscribe(null);
356-
} catch(final NullPointerException expected) {
356+
} catch (final NullPointerException expected) {
357357
gotNPE = true;
358358
}
359359
assertTrue(gotNPE, "onSubscribe(null) did not throw NullPointerException");
@@ -370,17 +370,22 @@ public void required_spec213_onNext_mustThrowNullPointerExceptionWhenParametersA
370370
public void run(WhiteboxTestStage stage) throws Throwable {
371371

372372
final Subscription subscription = new Subscription() {
373-
@Override public void request(final long elements) {}
374-
@Override public void cancel() {}
373+
@Override
374+
public void request(final long elements) {
375+
}
376+
377+
@Override
378+
public void cancel() {
379+
}
375380
};
376381

377382
{
378-
final Subscriber<T> sub = createSubscriber(stage.probe());
383+
final Subscriber<? super T> sub = stage.sub();
379384
boolean gotNPE = false;
380385
sub.onSubscribe(subscription);
381386
try {
382387
sub.onNext(null);
383-
} catch(final NullPointerException expected) {
388+
} catch (final NullPointerException expected) {
384389
gotNPE = true;
385390
}
386391
assertTrue(gotNPE, "onNext(null) did not throw NullPointerException");
@@ -390,7 +395,7 @@ public void run(WhiteboxTestStage stage) throws Throwable {
390395
}
391396
});
392397
}
393-
398+
394399
// Verifies rule: https://github.com/reactive-streams/reactive-streams#2.13
395400
@Override @Test
396401
public void required_spec213_onError_mustThrowNullPointerExceptionWhenParametersAreNull() throws Throwable {
@@ -399,17 +404,22 @@ public void required_spec213_onError_mustThrowNullPointerExceptionWhenParameters
399404
public void run(WhiteboxTestStage stage) throws Throwable {
400405

401406
final Subscription subscription = new Subscription() {
402-
@Override public void request(final long elements) {}
403-
@Override public void cancel() {}
407+
@Override
408+
public void request(final long elements) {
409+
}
410+
411+
@Override
412+
public void cancel() {
413+
}
404414
};
405415

406416
{
407-
final Subscriber<T> sub = createSubscriber(stage.probe());
417+
final Subscriber<? super T> sub = stage.sub();
408418
boolean gotNPE = false;
409419
sub.onSubscribe(subscription);
410420
try {
411421
sub.onError(null);
412-
} catch(final NullPointerException expected) {
422+
} catch (final NullPointerException expected) {
413423
gotNPE = true;
414424
}
415425
assertTrue(gotNPE, "onError(null) did not throw NullPointerException");

0 commit comments

Comments
 (0)