8232367: Update the jdk/java/net/httpclient tests to RS TCK 1.0.3

Reviewed-by: dfuchs
This commit is contained in:
Chris Hegarty 2019-11-04 10:06:59 +00:00
parent 7a006b3608
commit 9f6af13f9d

View File

@ -278,8 +278,9 @@ public abstract class SubscriberWhiteboxVerification<T> extends WithHelperPublis
@Override @Override
public void run(WhiteboxTestStage stage) throws InterruptedException { public void run(WhiteboxTestStage stage) throws InterruptedException {
stage.puppet().triggerRequest(1); stage.puppet().triggerRequest(1);
stage.puppet().signalCancel();
stage.expectRequest(); stage.expectRequest();
stage.puppet().signalCancel();
stage.expectCancelling();
stage.signalNext(); stage.signalNext();
stage.puppet().triggerRequest(1); stage.puppet().triggerRequest(1);
@ -824,11 +825,17 @@ public abstract class SubscriberWhiteboxVerification<T> extends WithHelperPublis
* Before sending any element to the subscriber, the TCK must wait for the subscriber to request that element, and * Before sending any element to the subscriber, the TCK must wait for the subscriber to request that element, and
* must be prepared for the subscriber to only request one element at a time, it is not enough for the TCK to * must be prepared for the subscriber to only request one element at a time, it is not enough for the TCK to
* simply invoke this method before sending elements. * simply invoke this method before sending elements.
* <p>
* An invocation of {@link #signalCancel()} may be coalesced into any elements that have not yet been requested,
* such that only a cancel signal is emitted.
*/ */
void triggerRequest(long elements); void triggerRequest(long elements);
/** /**
* Trigger {@code cancel()} on your {@link Subscriber} * Trigger {@code cancel()} on your {@link Subscriber}.
* <p>
* An invocation of this method may be coalesced into any outstanding requests, as requested by
*{@link #triggerRequest(long)}, such that only a cancel signal is emitted.
*/ */
void signalCancel(); void signalCancel();
} }