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 2013/12/09 13:12:02 UTC
svn commit: r1549559 - in /cxf/branches/2.7.x-fixes: ./
systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
Author: sergeyb
Date: Mon Dec 9 12:12:02 2013
New Revision: 1549559
URL: http://svn.apache.org/r1549559
Log:
Merged revisions 1549558 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1549558 | sergeyb | 2013-12-09 12:10:02 +0000 (Mon, 09 Dec 2013) | 1 line
[CXF-5446] Removing hardcoded client-side long timeouts from systests/jaxrs
........
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1549558
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java?rev=1549559&r1=1549558&r2=1549559&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java (original)
+++ cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java Mon Dec 9 12:12:02 2013
@@ -76,7 +76,6 @@ public class JAXRS20ClientServerBookTest
private void doTestGetGenericBook(String address, long bookId, boolean checkAnnotations)
throws Exception {
WebClient wc = WebClient.create(address);
- WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(1000000L);
wc.accept("application/xml");
Book book = wc.get(Book.class);
assertEquals(bookId, book.getId());
@@ -161,7 +160,6 @@ public class JAXRS20ClientServerBookTest
public void testPostMatchContainerFilterThrowsException() {
String address = "http://localhost:" + PORT + "/bookstore/bookheaders/simple?throwException";
WebClient wc = WebClient.create(address);
- WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(1000000L);
Response response = wc.get();
assertEquals(500, response.getStatus());
assertEquals("Postmatch filter error", response.readEntity(String.class));
@@ -244,7 +242,6 @@ public class JAXRS20ClientServerBookTest
String endpointAddress = "http://localhost:" + PORT + "/bookstore/books2";
WebClient wc = WebClient.create(endpointAddress,
Collections.singletonList(new ReplaceBodyFilter()));
- WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(1000000L);
wc.accept("text/mistypedxml").type("text/xml");
Book book = wc.post(new Book("book", 555L), Book.class);
assertEquals(561L, book.getId());
@@ -256,7 +253,6 @@ public class JAXRS20ClientServerBookTest
String endpointAddress = "http://localhost:" + PORT + "/bookstore/books2/mistyped";
WebClient wc = WebClient.create(endpointAddress,
Collections.singletonList(new ReplaceBodyFilter()));
- WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(1000000L);
wc.accept("text/mistypedxml").type("text/xml").header("THEMETHOD", "PUT");
Book book = wc.invoke("DELETE", new Book("book", 555L), Book.class);
assertEquals(561L, book.getId());
@@ -376,9 +372,7 @@ public class JAXRS20ClientServerBookTest
List<Object> providers = new ArrayList<Object>();
providers.add(new ClientHeaderRequestFilter());
providers.add(new ClientHeaderResponseFilter());
- WebClient wc = WebClient.create(address, providers);
- WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(1000000L);
- return wc;
+ return WebClient.create(address, providers);
}
private WebClient createWebClientPost(String address) {
@@ -387,9 +381,7 @@ public class JAXRS20ClientServerBookTest
providers.add(new ClientHeaderResponseFilter());
providers.add(new ClientReaderInterceptor());
providers.add(new ClientWriterInterceptor());
- WebClient wc = WebClient.create(address, providers);
- WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(1000000L);
- return wc;
+ return WebClient.create(address, providers);
}
private void doTestGetBookAsync(String address, boolean asyncInvoker)
Modified: cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java?rev=1549559&r1=1549558&r2=1549559&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java (original)
+++ cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java Mon Dec 9 12:12:02 2013
@@ -160,9 +160,7 @@ public class JAXRSAsyncClientTest extend
private WebClient createWebClient(String address) {
List<Object> providers = new ArrayList<Object>();
- WebClient wc = WebClient.create(address, providers);
- WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(1000000L);
- return wc;
+ return WebClient.create(address, providers);
}
private InvocationCallback<Object> createCallback(final Holder<Object> holder) {