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 9CF41F6C6 for ; Mon, 29 Apr 2013 16:06:21 +0000 (UTC) Received: (qmail 39146 invoked by uid 500); 29 Apr 2013 16:06:21 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 39087 invoked by uid 500); 29 Apr 2013 16:06:21 -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 39079 invoked by uid 99); 29 Apr 2013 16:06:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Apr 2013 16:06:21 +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, 29 Apr 2013 16:06:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4EC522388A66; Mon, 29 Apr 2013 16:06:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1477168 - in /cxf/branches/2.6.x-fixes/systests/ws-security/src/test: java/org/apache/cxf/systest/ws/coverage_checker/ resources/org/apache/cxf/systest/ws/coverage_checker/ resources/org/apache/cxf/systest/ws/coverage_checker/client/ resou... Date: Mon, 29 Apr 2013 16:06:00 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130429160600.4EC522388A66@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Mon Apr 29 16:05:59 2013 New Revision: 1477168 URL: http://svn.apache.org/r1477168 Log: Merged revisions 1477159 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ........ r1477159 | coheigea | 2013-04-29 16:42:15 +0100 (Mon, 29 Apr 2013) | 10 lines Merged revisions 1477152 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1477152 | coheigea | 2013-04-29 16:31:36 +0100 (Mon, 29 Apr 2013) | 2 lines Adding some tests for a secured SOAP Fault ........ ........ Modified: cxf/branches/2.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/DefaultCryptoCoverageCheckerTest.java cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client/client.xml cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server/server.xml Modified: cxf/branches/2.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/DefaultCryptoCoverageCheckerTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/DefaultCryptoCoverageCheckerTest.java?rev=1477168&r1=1477167&r2=1477168&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/DefaultCryptoCoverageCheckerTest.java (original) +++ cxf/branches/2.6.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/DefaultCryptoCoverageCheckerTest.java Mon Apr 29 16:05:59 2013 @@ -462,4 +462,37 @@ public class DefaultCryptoCoverageChecke ((java.io.Closeable)port).close(); bus.shutdown(true); } + + // Here the service is sending an secured message back to the client. For a server Fault + // message it should return a secured Fault message as well + @org.junit.Test + public void testClientChecker2() throws Exception { + SpringBusFactory bf = new SpringBusFactory(); + URL busFile = DefaultCryptoCoverageCheckerTest.class.getResource("client/client.xml"); + + Bus bus = bf.createBus(busFile.toString()); + SpringBusFactory.setDefaultBus(bus); + SpringBusFactory.setThreadDefaultBus(bus); + + URL wsdl = DefaultCryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl"); + Service service = Service.create(wsdl, SERVICE_QNAME); + QName portQName = new QName(NAMESPACE, "DoubleItClientCheckerPort2"); + DoubleItPortType port = + service.getPort(portQName, DoubleItPortType.class); + updateAddressPort(port, PORT); + + port.doubleIt(25); + + // Now try with a message that will create a Fault in the SEI + try { + port.doubleIt(0); + fail("Failure expected on trying to double 0"); + } catch (Exception ex) { + assertTrue(ex.getMessage().contains("0 can't be doubled")); + } + + ((java.io.Closeable)port).close(); + bus.shutdown(true); + } + } Modified: cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl?rev=1477168&r1=1477167&r2=1477168&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl (original) +++ cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl Mon Apr 29 16:05:59 2013 @@ -80,6 +80,9 @@ + + + Modified: cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client/client.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client/client.xml?rev=1477168&r1=1477167&r2=1477168&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client/client.xml (original) +++ cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client/client.xml Mon Apr 29 16:05:59 2013 @@ -77,4 +77,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + Modified: cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server/server.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server/server.xml?rev=1477168&r1=1477167&r2=1477168&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server/server.xml (original) +++ cxf/branches/2.6.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server/server.xml Mon Apr 29 16:05:59 2013 @@ -172,5 +172,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +