You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2017/01/13 11:55:17 UTC
[1/2] cxf git commit: Minimizing a test timeout to get it run faster
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes c3b8873d1 -> 78fbd425b
Minimizing a test timeout to get it run faster
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/78fbd425
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/78fbd425
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/78fbd425
Branch: refs/heads/3.1.x-fixes
Commit: 78fbd425ba4b49908e2b377a979a80ccf9cb29c5
Parents: 45f6dac
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Fri Jan 13 11:53:43 2017 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Fri Jan 13 11:54:56 2017 +0000
----------------------------------------------------------------------
.../src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java | 2 +-
.../java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/78fbd425/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
index 45d2a19..e37429f 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
@@ -295,7 +295,7 @@ public class BookStore {
public Response patchBook(Book book) {
if (book.getName().equals("Timeout")) {
try {
- Thread.sleep(25000);
+ Thread.sleep(4000);
} catch (InterruptedException e) {
}
return Response.ok(book).build();
http://git-wip-us.apache.org/repos/asf/cxf/blob/78fbd425/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
index ed78c62..465d570 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
@@ -113,8 +113,8 @@ public class JAXRSAsyncClientTest extends AbstractBusClientServerTestBase {
ClientConfiguration clientConfig = WebClient.getConfig(wc);
clientConfig.getRequestContext().put("use.async.http.conduit", true);
HTTPClientPolicy clientPolicy = clientConfig.getHttpConduit().getClient();
- clientPolicy.setReceiveTimeout(15000);
- clientPolicy.setConnectionTimeout(15000);
+ clientPolicy.setReceiveTimeout(2000);
+ clientPolicy.setConnectionTimeout(2000);
try {
Book book = wc.invoke("PATCH", new Book("Timeout", 123L), Book.class);
fail("should throw an exception due to timeout");
[2/2] cxf git commit: a test to demonstrate the receiveTimeout
configuration works for the jaxrs async invocation with ahc
Posted by se...@apache.org.
a test to demonstrate the receiveTimeout configuration works for the jaxrs async invocation with ahc
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/45f6dac0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/45f6dac0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/45f6dac0
Branch: refs/heads/3.1.x-fixes
Commit: 45f6dac04dc543371c9de1ac3fbd4260f7805dd6
Parents: c3b8873
Author: Freeman Fang <fr...@gmail.com>
Authored: Fri Jan 13 12:05:35 2017 +0800
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Fri Jan 13 11:54:56 2017 +0000
----------------------------------------------------------------------
.../org/apache/cxf/systest/jaxrs/BookStore.java | 10 +++++++++-
.../cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 20 ++++++++++++++++++++
2 files changed, 29 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/45f6dac0/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
index 6e9c6c4..45d2a19 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
@@ -293,7 +293,15 @@ public class BookStore {
@Produces("application/xml")
@Consumes("application/xml")
public Response patchBook(Book book) {
- return Response.ok(book).build();
+ if (book.getName().equals("Timeout")) {
+ try {
+ Thread.sleep(25000);
+ } catch (InterruptedException e) {
+ }
+ return Response.ok(book).build();
+ } else {
+ return Response.ok(book).build();
+ }
}
@DELETE
http://git-wip-us.apache.org/repos/asf/cxf/blob/45f6dac0/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
index 8713229..ed78c62 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
@@ -52,10 +52,12 @@ import javax.ws.rs.ext.MessageBodyReader;
import javax.ws.rs.ext.MessageBodyWriter;
import javax.xml.ws.Holder;
+import org.apache.cxf.jaxrs.client.ClientConfiguration;
import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -104,6 +106,24 @@ public class JAXRSAsyncClientTest extends AbstractBusClientServerTestBase {
}
@Test
+ public void testPatchBookTimeout() throws Exception {
+ String address = "http://localhost:" + PORT + "/bookstore/patch";
+ WebClient wc = WebClient.create(address);
+ wc.type("application/xml");
+ ClientConfiguration clientConfig = WebClient.getConfig(wc);
+ clientConfig.getRequestContext().put("use.async.http.conduit", true);
+ HTTPClientPolicy clientPolicy = clientConfig.getHttpConduit().getClient();
+ clientPolicy.setReceiveTimeout(15000);
+ clientPolicy.setConnectionTimeout(15000);
+ try {
+ Book book = wc.invoke("PATCH", new Book("Timeout", 123L), Book.class);
+ fail("should throw an exception due to timeout");
+ } catch (javax.ws.rs.ProcessingException e) {
+ //expected!!!
+ }
+ }
+
+ @Test
public void testPatchBookInputStream() throws Exception {
String address = "http://localhost:" + PORT + "/bookstore/patch";
WebClient wc = WebClient.create(address);