Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9B238107EB for ; Mon, 9 Dec 2013 12:10:34 +0000 (UTC) Received: (qmail 88832 invoked by uid 500); 9 Dec 2013 12:10:32 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 88709 invoked by uid 500); 9 Dec 2013 12:10:28 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 88701 invoked by uid 99); 9 Dec 2013 12:10:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Dec 2013 12:10:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Dec 2013 12:10:24 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 578292388868; Mon, 9 Dec 2013 12:10:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1549558 - in /cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs: JAXRS20ClientServerBookTest.java JAXRSAsyncClientTest.java Date: Mon, 09 Dec 2013 12:10:03 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131209121003.578292388868@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Mon Dec 9 12:10:02 2013 New Revision: 1549558 URL: http://svn.apache.org/r1549558 Log: [CXF-5446] Removing hardcoded client-side long timeouts from systests/jaxrs Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java?rev=1549558&r1=1549557&r2=1549558&view=diff ============================================================================== --- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java (original) +++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java Mon Dec 9 12:10:02 2013 @@ -84,7 +84,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()); @@ -200,7 +199,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)); @@ -283,7 +281,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()); @@ -295,7 +292,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()); @@ -415,9 +411,7 @@ public class JAXRS20ClientServerBookTest List providers = new ArrayList(); 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) { @@ -426,9 +420,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/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java?rev=1549558&r1=1549557&r2=1549558&view=diff ============================================================================== --- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java (original) +++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java Mon Dec 9 12:10:02 2013 @@ -161,9 +161,7 @@ public class JAXRSAsyncClientTest extend private WebClient createWebClient(String address) { List providers = new ArrayList(); - WebClient wc = WebClient.create(address, providers); - WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(1000000L); - return wc; + return WebClient.create(address, providers); } private InvocationCallback createCallback(final Holder holder) {