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 258BA200C45 for ; Tue, 28 Mar 2017 14:13:18 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 24673160B7E; Tue, 28 Mar 2017 12:13:18 +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 75599160B9C for ; Tue, 28 Mar 2017 14:13:17 +0200 (CEST) Received: (qmail 6338 invoked by uid 500); 28 Mar 2017 12:13:16 -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 6201 invoked by uid 99); 28 Mar 2017 12:13:16 -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; Tue, 28 Mar 2017 12:13:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4D1C5DFFD8; Tue, 28 Mar 2017 12:13:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Tue, 28 Mar 2017 12:13:19 -0000 Message-Id: <855ec06d90d445f9bfb583f89c2a0711@git.apache.org> In-Reply-To: <7dc47878ddb8447598825f32a5c7d719@git.apache.org> References: <7dc47878ddb8447598825f32a5c7d719@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] cxf git commit: Fixing tests archived-at: Tue, 28 Mar 2017 12:13:18 -0000 Fixing tests Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0ffcd507 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0ffcd507 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0ffcd507 Branch: refs/heads/master Commit: 0ffcd507e0f7bc5c33ddb819a474426035948c6d Parents: 9c6f0b8 Author: Colm O hEigeartaigh Authored: Tue Mar 28 13:10:51 2017 +0100 Committer: Colm O hEigeartaigh Committed: Tue Mar 28 13:10:51 2017 +0100 ---------------------------------------------------------------------- .../jaxrs/security/xml/JAXRSXmlSecTest.java | 26 ++++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/0ffcd507/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java index 6942508..67abc0c 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java @@ -279,7 +279,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { if (!useKeyInfo) { sigInInterceptor.setSignatureVerificationAlias("alice"); } - bean.getInInterceptors().add(sigInInterceptor); + bean.setProvider(sigInInterceptor); } else { XmlSigOutInterceptor sigOutInterceptor = new XmlSigOutInterceptor(); if (enveloping) { @@ -295,19 +295,13 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { WebClient wc = bean.createWebClient(); WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(10000000L); - try { - Book book; - if (!fromResponse) { - book = wc.post(new Book("CXF", 126L), Book.class); - } else { - book = wc.post(new Book("CXF", 126L)).readEntity(Book.class); - } - assertEquals(126L, book.getId()); - } catch (WebApplicationException ex) { - fail(ex.getMessage()); - } catch (ProcessingException ex) { - assertTrue(ex.getCause() instanceof BadRequestException); + Book book; + if (!fromResponse) { + book = wc.post(new Book("CXF", 126L), Book.class); + } else { + book = wc.post(new Book("CXF", 126L)).readEntity(Book.class); } + assertEquals(126L, book.getId()); } @Test @@ -336,7 +330,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { XmlSecInInterceptor sigInInterceptor = new XmlSecInInterceptor(); sigInInterceptor.setRequireSignature(true); - bean.getInInterceptors().add(sigInInterceptor); + bean.setProvider(sigInInterceptor); } else { XmlSigOutInterceptor sigOutInterceptor = new XmlSigOutInterceptor(); bean.getOutInterceptors().add(sigOutInterceptor); @@ -381,7 +375,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { XmlSecInInterceptor sigInInterceptor = new XmlSecInInterceptor(); sigInInterceptor.setRequireSignature(true); - bean.getInInterceptors().add(sigInInterceptor); + bean.setProvider(sigInInterceptor); } else { XmlSigOutInterceptor sigOutInterceptor = new XmlSigOutInterceptor(); bean.getOutInterceptors().add(sigOutInterceptor); @@ -577,7 +571,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { XmlSecInInterceptor encInInterceptor = new XmlSecInInterceptor(); encInInterceptor.setRequireEncryption(true); - bean.getInInterceptors().add(encInInterceptor); + bean.setProvider(encInInterceptor); } else { if (sign) { bean.getOutInterceptors().add(new XmlSigOutInterceptor());