Repository: cxf Updated Branches: refs/heads/master eec5aaf5a -> ecac53e02
Minor update to the Flowable test Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ecac53e0 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ecac53e0 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ecac53e0 Branch: refs/heads/master Commit: ecac53e0214447404664c81b7f04eccc8bd1ed3a Parents: eec5aaf Author: Sergey Beryozkin <sberyoz...@gmail.com> Authored: Wed Aug 30 17:20:26 2017 +0100 Committer: Sergey Beryozkin <sberyoz...@gmail.com> Committed: Wed Aug 30 17:20:26 2017 +0100 ---------------------------------------------------------------------- .../jaxrs/reactive/JAXRSRxJava2FlowableTest.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/ecac53e0/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2FlowableTest.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2FlowableTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2FlowableTest.java index 6e89960..1b70db0 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2FlowableTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactive/JAXRSRxJava2FlowableTest.java @@ -36,15 +36,12 @@ import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.jaxrs.model.AbstractResourceInfo; import org.apache.cxf.jaxrs.rx2.client.FlowableRxInvoker; import org.apache.cxf.jaxrs.rx2.client.FlowableRxInvokerProvider; -import org.apache.cxf.jaxrs.rx2.client.ObservableRxInvoker; -import org.apache.cxf.jaxrs.rx2.client.ObservableRxInvokerProvider; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.junit.BeforeClass; import org.junit.Test; import io.reactivex.Flowable; -import io.reactivex.Observable; public class JAXRSRxJava2FlowableTest extends AbstractBusClientServerTestBase { public static final String PORT = RxJava2FlowableServer.PORT; @@ -112,9 +109,9 @@ public class JAXRSRxJava2FlowableTest extends AbstractBusClientServerTestBase { public void testGetHelloWorldAsyncObservable() throws Exception { String address = "http://localhost:"; + PORT + "/rx2/flowable/textAsync"; WebClient wc = WebClient.create(address, - Collections.singletonList(new ObservableRxInvokerProvider())); - Observable<String> obs = wc.accept("text/plain") - .rx(ObservableRxInvoker.class) + Collections.singletonList(new FlowableRxInvokerProvider())); + Flowable<String> obs = wc.accept("text/plain") + .rx(FlowableRxInvoker.class) .get(String.class); Thread.sleep(2000); @@ -128,9 +125,9 @@ public class JAXRSRxJava2FlowableTest extends AbstractBusClientServerTestBase { @Test public void testGetHelloWorldAsyncObservable404() throws Exception { String address = "http://localhost:"; + PORT + "/rx2/flowable/textAsync404"; - Invocation.Builder b = ClientBuilder.newClient().register(new ObservableRxInvokerProvider()) + Invocation.Builder b = ClientBuilder.newClient().register(new FlowableRxInvokerProvider()) .target(address).request(); - b.rx(ObservableRxInvoker.class).get(String.class).subscribe( + b.rx(FlowableRxInvoker.class).get(String.class).subscribe( s -> { fail("Exception expected"); },
