Author: coheigea Date: Mon Jun 25 15:47:07 2012 New Revision: 1353609 URL: http://svn.apache.org/viewvc?rev=1353609&view=rev Log: Merged revisions 1353607 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1353607 | coheigea | 2012-06-25 16:44:46 +0100 (Mon, 25 Jun 2012) | 18 lines Merged revisions 1353599 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1353599 | coheigea | 2012-06-25 16:40:57 +0100 (Mon, 25 Jun 2012) | 10 lines Merged revisions 1353597 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1353597 | coheigea | 2012-06-25 16:38:29 +0100 (Mon, 25 Jun 2012) | 2 lines Added a test-case for passwordTypeStrict ........ ........ ........ Modified: cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java Modified: cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java?rev=1353609&r1=1353608&r2=1353609&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java (original) +++ cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java Mon Jun 25 15:47:07 2012 @@ -116,11 +116,21 @@ public class WSSecurityClientTest extend Map<String, Object> props = new HashMap<String, Object>(); props.put("action", "UsernameToken"); props.put("user", "alice"); + props.put("passwordType", "PasswordText"); WSS4JOutInterceptor wss4jOut = new WSS4JOutInterceptor(props); client.getOutInterceptors().add(wss4jOut); ((BindingProvider)greeter).getRequestContext().put("password", "password"); + + try { + greeter.greetMe("CXF"); + fail("should fail because of password text instead of digest"); + } catch (Exception ex) { + //expected + } + + props.put("passwordType", "PasswordDigest"); String s = greeter.greetMe("CXF"); assertEquals("Hello CXF", s);
