Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 95351200B45 for ; Fri, 15 Jul 2016 09:29:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 93E65160A6C; Fri, 15 Jul 2016 07:29:25 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id DCC39160A61 for ; Fri, 15 Jul 2016 09:29:24 +0200 (CEST) Received: (qmail 23650 invoked by uid 500); 15 Jul 2016 07:29:24 -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 23641 invoked by uid 99); 15 Jul 2016 07:29:24 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jul 2016 07:29:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C4778E0A3F; Fri, 15 Jul 2016 07:29:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: <5941ce3167d043debfb5df5345be0df5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Updating JAXRS20ClientServerBook test Date: Fri, 15 Jul 2016 07:29:23 +0000 (UTC) archived-at: Fri, 15 Jul 2016 07:29:25 -0000 Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 61477f36d -> 968b1de87 Updating JAXRS20ClientServerBook test Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/968b1de8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/968b1de8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/968b1de8 Branch: refs/heads/3.0.x-fixes Commit: 968b1de87954a1c26743c4135afeab43c36c7945 Parents: 61477f3 Author: Sergey Beryozkin Authored: Fri Jul 15 10:09:28 2016 +0300 Committer: Sergey Beryozkin Committed: Fri Jul 15 10:28:17 2016 +0300 ---------------------------------------------------------------------- .../src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java | 4 ++++ .../apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/968b1de8/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 af60a4f..2989013 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 @@ -869,6 +869,10 @@ public class BookStore { if (headerSimple != null) { builder.header("Simple", headerSimple); } + String aHeaderValue = httpHeaders.getHeaderString("a"); + if (aHeaderValue != null) { + builder.header("a", aHeaderValue); + } return builder; } http://git-wip-us.apache.org/repos/asf/cxf/blob/968b1de8/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java index a40dda6..8fd22e5 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java @@ -38,6 +38,7 @@ import javax.ws.rs.client.ClientRequestFilter; import javax.ws.rs.client.ClientResponseContext; import javax.ws.rs.client.ClientResponseFilter; import javax.ws.rs.client.Entity; +import javax.ws.rs.client.Invocation; import javax.ws.rs.client.InvocationCallback; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Feature; @@ -151,8 +152,12 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase Client client = ClientBuilder.newClient(); client.register((Object)ClientFilterClientAndConfigCheck.class); client.property("clientproperty", "somevalue"); - Book book = client.target(address).request("application/xml").get(Book.class); + Invocation.Builder builder = client.target(address).request("application/xml"); + builder.header("a", "b"); + Response r = builder.get(); + Book book = r.readEntity(Book.class); assertEquals(124L, book.getId()); + assertEquals("b", r.getHeaderString("a")); } @Test