[cxf] branch master updated: Adding WS-Security dispatch tests

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[cxf] branch master updated: Adding WS-Security dispatch tests

coheigea
Administrator
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new 5d67785  Adding WS-Security dispatch tests
5d67785 is described below

commit 5d67785208334062a950dc7f85ffcb7d52af3db5
Author: Colm O hEigeartaigh <[hidden email]>
AuthorDate: Wed Feb 7 18:25:55 2018 +0000

    Adding WS-Security dispatch tests
---
 .../apache/cxf/systest/ws/action/ActionTest.java   | 154 +++++++++++++++++++--
 .../systest/ws/action/SignatureWhitespaceTest.java |  15 +-
 .../systest/ws/algsuite/AlgorithmSuiteTest.java    |  20 +--
 .../ws/algsuite/StaxAlgorithmSuiteTest.java        |   4 +-
 .../cxf/systest/ws/basicauth/BasicAuthTest.java    |  10 +-
 .../systest/ws/bindings/BindingPropertiesTest.java |  22 +--
 .../apache/cxf/systest/ws/cache/CachingTest.java   |   6 +-
 .../CryptoCoverageCheckerTest.java                 |  14 +-
 .../org/apache/cxf/systest/ws/fault/FaultTest.java |  12 +-
 .../org/apache/cxf/systest/ws/gcm/GCMTest.java     |  10 +-
 .../cxf/systest/ws/https/HttpsTokenTest.java       |   8 +-
 .../org/apache/cxf/systest/ws/parts/PartsTest.java |  16 +--
 .../systest/ws/tokens/BinarySecurityTokenTest.java |   2 +-
 .../ws/tokens/EndorsingSupportingTokenTest.java    |   4 +-
 .../cxf/systest/ws/tokens/SupportingTokenTest.java |   8 +-
 .../systest/ws/ut/UsernameTokenDerivedTest.java    |  14 +-
 .../cxf/systest/ws/ut/UsernameTokenPolicyTest.java |  10 +-
 .../cxf/systest/ws/ut/UsernameTokenTest.java       |  26 ++--
 .../apache/cxf/systest/ws/wssc/WSSCUnitTest.java   |   4 +-
 .../apache/cxf/systest/ws/x509/X509TokenTest.java  |  94 ++++++-------
 .../org/apache/cxf/systest/ws/xkms/XKMSTest.java   |   4 +-
 .../cxf/systest/ws/action/DoubleItAction.wsdl      |   3 +
 .../org/apache/cxf/systest/ws/action/server.xml    |  13 ++
 23 files changed, 318 insertions(+), 155 deletions(-)

diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
index 3c22310..7e69c45 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
@@ -19,19 +19,31 @@
 
 package org.apache.cxf.systest.ws.action;
 
+import java.io.StringReader;
 import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.xml.namespace.QName;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.ws.Dispatch;
 import javax.xml.ws.Service;
 
+import org.w3c.dom.Document;
+
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.jaxws.DispatchImpl;
+import org.apache.cxf.staxutils.StaxUtils;
+import org.apache.cxf.systest.ws.common.KeystorePasswordCallback;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
 import org.apache.cxf.systest.ws.ut.SecurityHeaderCacheInterceptor;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
+import org.apache.wss4j.common.ConfigurationConstants;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.example.contract.doubleit.DoubleItPortType;
 
@@ -87,7 +99,7 @@ public class ActionTest extends AbstractBusClientServerTestBase {
         DoubleItPortType port =
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(port, PORT);
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
@@ -112,7 +124,7 @@ public class ActionTest extends AbstractBusClientServerTestBase {
 
 
         // Successful call
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the client is not sending a UsernameToken
         portQName = new QName(NAMESPACE, "DoubleItUsernameTokenPort2");
@@ -131,7 +143,7 @@ public class ActionTest extends AbstractBusClientServerTestBase {
         port = service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(port, UTServer.PORT);
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
@@ -160,7 +172,7 @@ public class ActionTest extends AbstractBusClientServerTestBase {
         cxfClient.getOutInterceptors().add(cacheInterceptor);
 
         // Make two invocations with the same UsernameToken
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
         try {
             port.doubleIt(25);
             fail("Failure expected on a replayed UsernameToken");
@@ -192,7 +204,7 @@ public class ActionTest extends AbstractBusClientServerTestBase {
         DoubleItPortType port =
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(port, PORT);
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
@@ -221,7 +233,7 @@ public class ActionTest extends AbstractBusClientServerTestBase {
         cxfClient.getOutInterceptors().add(cacheInterceptor);
 
         // Make two invocations with the same SecurityHeader
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
         try {
             port.doubleIt(25);
             fail("Failure expected on a replayed Timestamp");
@@ -252,7 +264,7 @@ public class ActionTest extends AbstractBusClientServerTestBase {
         updateAddressPort(port, PORT);
 
         // Successful call
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
@@ -277,7 +289,7 @@ public class ActionTest extends AbstractBusClientServerTestBase {
         updateAddressPort(port, PORT);
 
         // Successful call
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
@@ -301,7 +313,7 @@ public class ActionTest extends AbstractBusClientServerTestBase {
         updateAddressPort(port, PORT);
 
         // Successful call
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
@@ -435,10 +447,132 @@ public class ActionTest extends AbstractBusClientServerTestBase {
         DoubleItPortType port =
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(port, PORT);
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
+
+        ((java.io.Closeable)port).close();
+        bus.shutdown(true);
+    }
+
+    @org.junit.Test
+    public void testSignatureProgrammatic() throws Exception {
+
+        SpringBusFactory bf = new SpringBusFactory();
+        URL busFile = ActionTest.class.getResource("client.xml");
+
+        Bus bus = bf.createBus(busFile.toString());
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
+
+        URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl");
+        Service service = Service.create(wsdl, SERVICE_QNAME);
+        QName portQName = new QName(NAMESPACE, "DoubleItSignatureConfigPort");
+
+        DoubleItPortType port =
+                service.getPort(portQName, DoubleItPortType.class);
+        updateAddressPort(port, PORT);
+
+        // Programmatic interceptor
+        Map<String, Object> props = new HashMap<>();
+        props.put(ConfigurationConstants.ACTION, "Signature");
+        props.put(ConfigurationConstants.SIGNATURE_USER, "alice");
+        props.put(ConfigurationConstants.PW_CALLBACK_REF, new KeystorePasswordCallback());
+        props.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
+        props.put(ConfigurationConstants.SIG_PROP_FILE, "alice.properties");
+        WSS4JOutInterceptor outInterceptor = new WSS4JOutInterceptor(props);
+        Client client = ClientProxy.getClient(port);
+        client.getOutInterceptors().add(outInterceptor);
+
+        assertEquals(50, port.doubleIt(25));
 
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
     }
 
+    @org.junit.Test
+    public void testSignatureDispatchPayload() throws Exception {
+
+        SpringBusFactory bf = new SpringBusFactory();
+        URL busFile = ActionTest.class.getResource("client.xml");
+
+        Bus bus = bf.createBus(busFile.toString());
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
+
+        URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl");
+        Service service = Service.create(wsdl, SERVICE_QNAME);
+        QName portQName = new QName(NAMESPACE, "DoubleItSignatureConfigPort");
+
+        Dispatch<StreamSource> dispatch =
+            service.createDispatch(portQName, StreamSource.class, Service.Mode.PAYLOAD);
+        updateAddressPort(dispatch, PORT);
+
+        // Programmatic interceptor
+        Map<String, Object> props = new HashMap<>();
+        props.put(ConfigurationConstants.ACTION, "Signature");
+        props.put(ConfigurationConstants.SIGNATURE_USER, "alice");
+        props.put(ConfigurationConstants.PW_CALLBACK_REF, new KeystorePasswordCallback());
+        props.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
+        props.put(ConfigurationConstants.SIG_PROP_FILE, "alice.properties");
+        WSS4JOutInterceptor outInterceptor = new WSS4JOutInterceptor(props);
+        Client client = ((DispatchImpl<StreamSource>) dispatch).getClient();
+        client.getOutInterceptors().add(outInterceptor);
+
+        String payload = "<ns2:DoubleIt xmlns:ns2=\"http://www.example.org/schema/DoubleIt\">"
+            + "<numberToDouble>25</numberToDouble></ns2:DoubleIt>";
+        StreamSource request = new StreamSource(new StringReader(payload));
+        StreamSource response = dispatch.invoke(request);
+        assertNotNull(response);
+
+        Document doc = StaxUtils.read(response.getInputStream());
+        assertEquals("50", doc.getElementsByTagNameNS(null, "doubledNumber").item(0).getTextContent());
+
+        ((java.io.Closeable)dispatch).close();
+        bus.shutdown(true);
+    }
+
+    @org.junit.Test
+    public void testSignatureDispatchMessage() throws Exception {
+
+        SpringBusFactory bf = new SpringBusFactory();
+        URL busFile = ActionTest.class.getResource("client.xml");
+
+        Bus bus = bf.createBus(busFile.toString());
+        BusFactory.setDefaultBus(bus);
+        BusFactory.setThreadDefaultBus(bus);
+
+        URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl");
+        Service service = Service.create(wsdl, SERVICE_QNAME);
+        QName portQName = new QName(NAMESPACE, "DoubleItSignatureConfigPort");
+
+        Dispatch<StreamSource> dispatch =
+            service.createDispatch(portQName, StreamSource.class, Service.Mode.MESSAGE);
+        updateAddressPort(dispatch, PORT);
+
+        // Programmatic interceptor
+        Map<String, Object> props = new HashMap<>();
+        props.put(ConfigurationConstants.ACTION, "Signature");
+        props.put(ConfigurationConstants.SIGNATURE_USER, "alice");
+        props.put(ConfigurationConstants.PW_CALLBACK_REF, new KeystorePasswordCallback());
+        props.put(ConfigurationConstants.SIG_KEY_ID, "DirectReference");
+        props.put(ConfigurationConstants.SIG_PROP_FILE, "alice.properties");
+        WSS4JOutInterceptor outInterceptor = new WSS4JOutInterceptor(props);
+        Client client = ((DispatchImpl<StreamSource>) dispatch).getClient();
+        client.getOutInterceptors().add(outInterceptor);
+
+        String payload = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
+            + "<soap:Header></soap:Header><soap:Body>"
+            + "<ns2:DoubleIt xmlns:ns2=\"http://www.example.org/schema/DoubleIt\">"
+            + "<numberToDouble>25</numberToDouble></ns2:DoubleIt>"
+            + "</soap:Body></soap:Envelope>";
+        StreamSource request = new StreamSource(new StringReader(payload));
+        StreamSource response = dispatch.invoke(request);
+        assertNotNull(response);
+
+        Document doc = StaxUtils.read(response.getInputStream());
+        assertEquals("50", doc.getElementsByTagNameNS(null, "doubledNumber").item(0).getTextContent());
+
+        ((java.io.Closeable)dispatch).close();
+        bus.shutdown(true);
+    }
+
 }
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java
index 5c00608..0bdd30f 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java
@@ -29,11 +29,14 @@ import javax.xml.transform.stream.StreamSource;
 import javax.xml.ws.Dispatch;
 import javax.xml.ws.Service;
 
+import org.w3c.dom.Document;
+
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.jaxws.DispatchImpl;
+import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.cxf.systest.ws.common.SecurityTestUtil;
 import org.apache.cxf.systest.ws.common.TestParam;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -109,7 +112,7 @@ public class SignatureWhitespaceTest extends AbstractBusClientServerTestBase {
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(port, test.getPort());
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
@@ -154,6 +157,11 @@ public class SignatureWhitespaceTest extends AbstractBusClientServerTestBase {
         // Make a successful request
         StreamSource response = dispatch.invoke(request);
         assertNotNull(response);
+
+        Document doc = StaxUtils.read(response.getInputStream());
+        assertEquals("50", doc.getElementsByTagNameNS(null, "doubledNumber").item(0).getTextContent());
+
+        ((java.io.Closeable)dispatch).close();
     }
 
     @org.junit.Test
@@ -185,6 +193,11 @@ public class SignatureWhitespaceTest extends AbstractBusClientServerTestBase {
         // Make a successful request
         StreamSource response = dispatch.invoke(request);
         assertNotNull(response);
+
+        Document doc = StaxUtils.read(response.getInputStream());
+        assertEquals("50", doc.getElementsByTagNameNS(null, "doubledNumber").item(0).getTextContent());
+
+        ((java.io.Closeable)dispatch).close();
     }
 
 }
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
index 33e1955..69386a5 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
@@ -80,11 +80,11 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase {
 
         // This should succeed as the client + server policies match
         // DOM
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // Streaming
         SecurityTestUtil.enableStreaming(port);
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         portQName = new QName(NAMESPACE, "DoubleItSymmetric128Port2");
         port = service.getPort(portQName, DoubleItPortType.class);
@@ -161,11 +161,11 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase {
         updateAddressPort(port, PORT);
 
         // DOM
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // Streaming
         SecurityTestUtil.enableStreaming(port);
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         bus.shutdown(true);
     }
@@ -188,7 +188,7 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase {
         updateAddressPort(port, PORT);
 
         // This should succeed as the client + server settings match
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         portQName = new QName(NAMESPACE, "DoubleItEncryptionOAEPPort2");
         port = service.getPort(portQName, DoubleItPortType.class);
@@ -238,7 +238,7 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase {
         updateAddressPort(port, PORT);
 
         // This should succeed as the client + server settings match
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail as the client uses uses RSA-SHA256 + the server uses RSA-SHA1
         if (SecurityTestUtil.checkUnrestrictedPoliciesInstalled()) {
@@ -278,11 +278,11 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase {
 
         // This should succeed as the client + server policies match
         // DOM
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // Streaming
         SecurityTestUtil.enableStreaming(port);
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         portQName = new QName(NAMESPACE, "DoubleItSymmetric128InclusivePort2");
         port = service.getPort(portQName, DoubleItPortType.class);
@@ -332,11 +332,11 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase {
         updateAddressPort(port, PORT);
 
         // DOM
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // Streaming
         SecurityTestUtil.enableStreaming(port);
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         bus.shutdown(true);
     }
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java
index af59ee1..0767c27 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java
@@ -80,11 +80,11 @@ public class StaxAlgorithmSuiteTest extends AbstractBusClientServerTestBase {
 
         // This should succeed as the client + server policies match
         // DOM
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // Streaming
         SecurityTestUtil.enableStreaming(port);
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         portQName = new QName(NAMESPACE, "DoubleItSymmetric128Port2");
         port = service.getPort(portQName, DoubleItPortType.class);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java
index 655df9f..d4a5d62 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java
@@ -34,8 +34,8 @@ import org.example.contract.doubleit.DoubleItPortType;
 import org.junit.BeforeClass;
 
 /**
- * A test for Basic Auth using the WS-SecurityPolicy HttpBasicAuthentication policy.
- * Note the basic auth credentials are not actually authenticated in this test...we are testing
+ * A test for Basic Auth using the WS-SecurityPolicy HttpBasicAuthentication policy.
+ * Note the basic auth credentials are not actually authenticated in this test...we are testing
  * the WS-SecurityPolicy enforcement of whether the credentials are present or not.
  */
 public class BasicAuthTest extends AbstractBusClientServerTestBase {
@@ -77,12 +77,12 @@ public class BasicAuthTest extends AbstractBusClientServerTestBase {
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(utPort, PORT);
 
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         ((java.io.Closeable)utPort).close();
         bus.shutdown(true);
     }
-    
+
     @org.junit.Test
     public void testNoBasicAuthCredentials() throws Exception {
 
@@ -110,5 +110,5 @@ public class BasicAuthTest extends AbstractBusClientServerTestBase {
         ((java.io.Closeable)utPort).close();
         bus.shutdown(true);
     }
-    
+
 }
\ No newline at end of file
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
index 4818c66..6ffd5c1 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java
@@ -110,7 +110,7 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as OnlySignEntireHeadersAndBody is specified
         portQName = new QName(NAMESPACE, "DoubleItOnlySignPort");
@@ -155,7 +155,7 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the client is not encrypting the signature is specified
         portQName = new QName(NAMESPACE, "DoubleItEncryptSignaturePort2");
@@ -201,7 +201,7 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the client is not sending a Timestamp
         portQName = new QName(NAMESPACE, "DoubleItIncludeTimestampPort2");
@@ -247,7 +247,7 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the client is not following the correct steps for this property
         portQName = new QName(NAMESPACE, "DoubleItEncryptBeforeSigningPort2");
@@ -293,7 +293,7 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the client is not following the correct steps for this property
         portQName = new QName(NAMESPACE, "DoubleItSignBeforeEncryptingPort2");
@@ -342,7 +342,7 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
 
         // TODO Timestamp First/Last validation not working - see WSS-444
         if (!STAX_PORT.equals(test.getPort())) {
-            port.doubleIt(25);
+            assertEquals(50, port.doubleIt(25));
         }
 
         // This should fail, as the client is sending the timestamp last
@@ -393,7 +393,7 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
 
         // TODO Timestamp First/Last validation not working - see WSS-444
         if (!STAX_PORT.equals(test.getPort())) {
-            port.doubleIt(25);
+            assertEquals(50, port.doubleIt(25));
         }
 
         // This should fail, as the client is sending the timestamp first
@@ -444,7 +444,7 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
 
         // TODO Strict validation not working - see WSS-444
         if (!STAX_PORT.equals(test.getPort())) {
-            port.doubleIt(25);
+            assertEquals(50, port.doubleIt(25));
         }
 
         // This should fail, as the client is sending the timestamp last
@@ -495,7 +495,7 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
 
         // TODO DOM server not working
         if (!PORT.equals(test.getPort())) {
-            port.doubleIt(25);
+            assertEquals(50, port.doubleIt(25));
         }
 
         // This should fail, as the property is not enabled
@@ -545,7 +545,7 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as SignatureConfirmation is not enabled
         portQName = new QName(NAMESPACE, "DoubleItSignatureConfirmationPort2");
@@ -588,7 +588,7 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java
index ff959a2..1dd3554 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java
@@ -106,7 +106,7 @@ public class CachingTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         Client client = ClientProxy.getClient(port);
         TokenStore tokenStore =
@@ -177,7 +177,7 @@ public class CachingTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         Client client = ClientProxy.getClient(port);
         TokenStore tokenStore =
@@ -203,7 +203,7 @@ public class CachingTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port2);
         }
 
-        port2.doubleIt(35);
+        assertEquals(70, port2.doubleIt(35));
 
         client = ClientProxy.getClient(port2);
         tokenStore =
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
index 9a36a3f..fddb1ca 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
@@ -137,7 +137,7 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
             bus.getOutInterceptors().add(outInterceptor);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
@@ -279,7 +279,7 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
             bus.getOutInterceptors().add(outInterceptor);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
@@ -427,7 +427,7 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
             bus.getOutInterceptors().add(outInterceptor);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
@@ -556,7 +556,7 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
             bus.getOutInterceptors().add(outInterceptor);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
@@ -604,7 +604,7 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
             bus.getOutInterceptors().add(outInterceptor);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
@@ -667,7 +667,7 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
 
         // This test only applies to the DOM implementation
         if (PORT.equals(test.getPort()) && !test.isStreaming()) {
-            port.doubleIt(25);
+            assertEquals(50, port.doubleIt(25));
 
             // Now try with a message that will create a Fault in the SEI
             try {
@@ -725,7 +725,7 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase {
             bus.getOutInterceptors().add(outInterceptor);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
index e9b15e3..55e9c9e 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
@@ -89,7 +89,7 @@ public class FaultTest extends AbstractBusClientServerTestBase {
 
         // Make a successful invocation
         ((BindingProvider)utPort).getRequestContext().put(SecurityConstants.USERNAME, "alice");
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         // Now make an invocation using another username
         ((BindingProvider)utPort).getRequestContext().put(SecurityConstants.USERNAME, "bob");
@@ -106,7 +106,7 @@ public class FaultTest extends AbstractBusClientServerTestBase {
 
         // Make a successful invocation
         ((BindingProvider)utPort).getRequestContext().put(SecurityConstants.USERNAME, "alice");
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         // Now make an invocation using another username
         ((BindingProvider)utPort).getRequestContext().put(SecurityConstants.USERNAME, "bob");
@@ -140,7 +140,7 @@ public class FaultTest extends AbstractBusClientServerTestBase {
 
         // Make a successful invocation
         ((BindingProvider)utPort).getRequestContext().put(SecurityConstants.USERNAME, "alice");
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         // Now make an invocation using another username
         ((BindingProvider)utPort).getRequestContext().put(SecurityConstants.USERNAME, "bob");
@@ -173,7 +173,7 @@ public class FaultTest extends AbstractBusClientServerTestBase {
 
         // Make a successful invocation
         ((BindingProvider)utPort).getRequestContext().put(SecurityConstants.USERNAME, "alice");
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         // Now make an invocation using another username
         ((BindingProvider)utPort).getRequestContext().put(SecurityConstants.USERNAME, "bob");
@@ -263,7 +263,7 @@ public class FaultTest extends AbstractBusClientServerTestBase {
 
         // Make a successful invocation
         ((BindingProvider)utPort).getRequestContext().put(SecurityConstants.USERNAME, "alice");
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         // Now make an invocation using another username
         ((BindingProvider)utPort).getRequestContext().put(SecurityConstants.USERNAME, "bob");
@@ -299,7 +299,7 @@ public class FaultTest extends AbstractBusClientServerTestBase {
 
         // Make a successful invocation
         ((BindingProvider)utPort).getRequestContext().put(SecurityConstants.USERNAME, "alice");
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         // Now make an invocation using another username
         ((BindingProvider)utPort).getRequestContext().put(SecurityConstants.USERNAME, "bob");
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
index b016c4e..89872d0 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java
@@ -136,7 +136,7 @@ public class GCMTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(gcmPort);
         }
 
-        gcmPort.doubleIt(25);
+        assertEquals(50, gcmPort.doubleIt(25));
 
         ((java.io.Closeable)gcmPort).close();
         bus.shutdown(true);
@@ -179,7 +179,7 @@ public class GCMTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(gcmPort);
         }
 
-        gcmPort.doubleIt(25);
+        assertEquals(50, gcmPort.doubleIt(25));
 
         ((java.io.Closeable)gcmPort).close();
         bus.shutdown(true);
@@ -221,7 +221,7 @@ public class GCMTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(gcmPort);
         }
 
-        gcmPort.doubleIt(25);
+        assertEquals(50, gcmPort.doubleIt(25));
 
         ((java.io.Closeable)gcmPort).close();
         bus.shutdown(true);
@@ -268,7 +268,7 @@ public class GCMTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(gcmPort);
         }
 
-        gcmPort.doubleIt(25);
+        assertEquals(50, gcmPort.doubleIt(25));
 
         ((java.io.Closeable)gcmPort).close();
         bus.shutdown(true);
@@ -316,7 +316,7 @@ public class GCMTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(gcmPort);
         }
 
-        gcmPort.doubleIt(25);
+        assertEquals(50, gcmPort.doubleIt(25));
 
         ((java.io.Closeable)gcmPort).close();
         bus.shutdown(true);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
index bb2b4fb..b8384e0 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java
@@ -108,7 +108,7 @@ public class HttpsTokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the client does not use a client cert
         portQName = new QName(NAMESPACE, "DoubleItRequireClientCertPort2");
@@ -171,7 +171,7 @@ public class HttpsTokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
@@ -198,7 +198,7 @@ public class HttpsTokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the client does not send a UsernamePassword
         portQName = new QName(NAMESPACE, "DoubleItBasicAuthPort2");
@@ -244,7 +244,7 @@ public class HttpsTokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java
index 3d9a48d..c2eab58 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java
@@ -148,7 +148,7 @@ public class PartsTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the service requires a (bad) header
         portQName = new QName(NAMESPACE, "DoubleItRequiredPartsPort2");
@@ -193,7 +193,7 @@ public class PartsTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the service requires a (bad) header
         portQName = new QName(NAMESPACE, "DoubleItRequiredElementsPort2");
@@ -239,7 +239,7 @@ public class PartsTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the service requires that the Body must be signed
         portQName = new QName(NAMESPACE, "DoubleItSignedPartsPort2");
@@ -303,7 +303,7 @@ public class PartsTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the service requires that the To header must be signed
         portQName = new QName(NAMESPACE, "DoubleItSignedElementsPort2");
@@ -349,7 +349,7 @@ public class PartsTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the service requires that the Body must be encrypted
         portQName = new QName(NAMESPACE, "DoubleItEncryptedPartsPort2");
@@ -413,7 +413,7 @@ public class PartsTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the service requires that the header must be encrypted
         portQName = new QName(NAMESPACE, "DoubleItEncryptedElementsPort2");
@@ -463,7 +463,7 @@ public class PartsTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the service requires that the header must be encrypted
         portQName = new QName(NAMESPACE, "DoubleItEncryptedElementsPort2");
@@ -509,7 +509,7 @@ public class PartsTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the service requires that the header must be encrypted
         portQName = new QName(NAMESPACE, "DoubleItContentEncryptedElementsPort2");
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/BinarySecurityTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/BinarySecurityTokenTest.java
index 2e7d3fa..1181867 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/BinarySecurityTokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/BinarySecurityTokenTest.java
@@ -98,7 +98,7 @@ public class BinarySecurityTokenTest extends AbstractBusClientServerTestBase {
 
         ((BindingProvider)port).getRequestContext().put(SecurityConstants.TOKEN, securityToken);
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java
index cdc1b97..18c9451 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java
@@ -104,7 +104,7 @@ public class EndorsingSupportingTokenTest extends AbstractBusClientServerTestBas
         DoubleItPortType port = service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(port, test.getPort());
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the client is signing (but not endorsing) the X.509 Token
         portQName = new QName(NAMESPACE, "DoubleItEndorsingSupportingPort2");
@@ -158,7 +158,7 @@ public class EndorsingSupportingTokenTest extends AbstractBusClientServerTestBas
         DoubleItPortType port = service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(port, test.getPort());
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the client is signing (but not endorsing) the X.509 Token
         portQName = new QName(NAMESPACE, "DoubleItSignedEndorsingSupportingPort2");
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
index 1388995..a5c3291 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java
@@ -124,7 +124,7 @@ public class SupportingTokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the client is not signing the UsernameToken
         portQName = new QName(NAMESPACE, "DoubleItSignedSupportingPort2");
@@ -188,7 +188,7 @@ public class SupportingTokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the client is not encrypting the UsernameToken
         portQName = new QName(NAMESPACE, "DoubleItEncryptedSupportingPort2");
@@ -257,7 +257,7 @@ public class SupportingTokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the client is not encrypting the UsernameToken
         portQName = new QName(NAMESPACE, "DoubleItEncryptedSupportingPort5");
@@ -308,7 +308,7 @@ public class SupportingTokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the client is not encrypting the UsernameToken
         portQName = new QName(NAMESPACE, "DoubleItSignedEncryptedSupportingPort2");
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java
index d9a0fab..8806608 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java
@@ -81,7 +81,7 @@ public class UsernameTokenDerivedTest extends AbstractBusClientServerTestBase {
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(utPort, PORT);
 
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         ((java.io.Closeable)utPort).close();
         bus.shutdown(true);
@@ -108,7 +108,7 @@ public class UsernameTokenDerivedTest extends AbstractBusClientServerTestBase {
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(utPort, PORT);
 
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         ((java.io.Closeable)utPort).close();
         bus.shutdown(true);
@@ -135,7 +135,7 @@ public class UsernameTokenDerivedTest extends AbstractBusClientServerTestBase {
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(utPort, PORT);
 
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         ((java.io.Closeable)utPort).close();
         bus.shutdown(true);
@@ -162,7 +162,7 @@ public class UsernameTokenDerivedTest extends AbstractBusClientServerTestBase {
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(utPort, PORT2);
 
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         ((java.io.Closeable)utPort).close();
         bus.shutdown(true);
@@ -189,7 +189,7 @@ public class UsernameTokenDerivedTest extends AbstractBusClientServerTestBase {
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(utPort, PORT);
 
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         ((java.io.Closeable)utPort).close();
         bus.shutdown(true);
@@ -216,7 +216,7 @@ public class UsernameTokenDerivedTest extends AbstractBusClientServerTestBase {
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(utPort, PORT);
 
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         ((java.io.Closeable)utPort).close();
         bus.shutdown(true);
@@ -243,7 +243,7 @@ public class UsernameTokenDerivedTest extends AbstractBusClientServerTestBase {
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(utPort, PORT);
 
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         ((java.io.Closeable)utPort).close();
         bus.shutdown(true);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
index 7f4afcb..9564387 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
@@ -108,7 +108,7 @@ public class UsernameTokenPolicyTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the client is not sending a UsernameToken Supporting Token
         portQName = new QName(NAMESPACE, "DoubleItSupportingTokenPort2");
@@ -153,7 +153,7 @@ public class UsernameTokenPolicyTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the client is sending a hashed password
         portQName = new QName(NAMESPACE, "DoubleItPlaintextPort2");
@@ -214,7 +214,7 @@ public class UsernameTokenPolicyTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the client is sending a plaintext password
         portQName = new QName(NAMESPACE, "DoubleItHashPort2");
@@ -275,7 +275,7 @@ public class UsernameTokenPolicyTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the client is not sending a Created element
         portQName = new QName(NAMESPACE, "DoubleItCreatedPort2");
@@ -320,7 +320,7 @@ public class UsernameTokenPolicyTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         // This should fail, as the client is not sending a Nonce element
         portQName = new QName(NAMESPACE, "DoubleItNoncePort2");
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
index 9eaf277..101fbaf 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
@@ -135,7 +135,7 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
         HTTPConduit http = (HTTPConduit) client.getConduit();
         http.setTlsClientParameters(tlsParams);
 
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         ((java.io.Closeable)utPort).close();
     }
@@ -161,7 +161,7 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(utPort);
         }
 
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         ((java.io.Closeable)utPort).close();
         bus.shutdown(true);
@@ -188,7 +188,7 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(utPort);
         }
 
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         ((java.io.Closeable)utPort).close();
         bus.shutdown(true);
@@ -215,7 +215,7 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(utPort);
         }
 
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         ((java.io.Closeable)utPort).close();
         bus.shutdown(true);
@@ -242,7 +242,7 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(utPort);
         }
 
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         ((java.io.Closeable)utPort).close();
         bus.shutdown(true);
@@ -269,7 +269,7 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(utPort);
         }
 
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         ((java.io.Closeable)utPort).close();
         bus.shutdown(true);
@@ -296,7 +296,7 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(utPort);
         }
 
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         ((java.io.Closeable)utPort).close();
         bus.shutdown(true);
@@ -323,7 +323,7 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(utPort);
         }
 
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         ((java.io.Closeable)utPort).close();
         bus.shutdown(true);
@@ -350,7 +350,7 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(utPort);
         }
 
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         ((java.io.Closeable)utPort).close();
         bus.shutdown(true);
@@ -377,7 +377,7 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(utPort);
         }
 
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         ((java.io.Closeable)utPort).close();
         bus.shutdown(true);
@@ -442,7 +442,7 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
             cxfClient.getOutInterceptors().add(cacheInterceptor);
 
             // Make two invocations with the same UsernameToken
-            utPort.doubleIt(25);
+            assertEquals(50, utPort.doubleIt(25));
             try {
                 utPort.doubleIt(25);
                 fail("Failure expected on a replayed UsernameToken");
@@ -482,7 +482,7 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
             cxfClient.getOutInterceptors().add(cacheInterceptor);
 
             // Make two invocations with the same UsernameToken
-            utPort.doubleIt(25);
+            assertEquals(50, utPort.doubleIt(25));
             try {
                 utPort.doubleIt(25);
                 fail("Failure expected on a replayed UsernameToken");
@@ -517,7 +517,7 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
         }
 
         ((BindingProvider)utPort).getRequestContext().put(SecurityConstants.USERNAME, "Alice");
-        utPort.doubleIt(25);
+        assertEquals(50, utPort.doubleIt(25));
 
         try {
             ((BindingProvider)utPort).getRequestContext().put(SecurityConstants.USERNAME, "Frank");
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
index 18b9de3..bca6779 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
@@ -126,7 +126,7 @@ public class WSSCUnitTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         ((java.io.Closeable)port).close();
     }
@@ -152,7 +152,7 @@ public class WSSCUnitTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         ((java.io.Closeable)port).close();
     }
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
index 430b931..f9d1466 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
@@ -167,7 +167,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -194,7 +194,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -221,7 +221,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -248,7 +248,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -279,7 +279,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
                 "bob.properties");
         ((BindingProvider)x509Port).getRequestContext().put(SecurityConstants.ENCRYPT_USERNAME, "bob");
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -308,7 +308,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -335,7 +335,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
                 service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(x509Port, INTERMEDIARY_PORT);
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -362,7 +362,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -389,7 +389,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -413,7 +413,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
         updateAddressPort(x509Port, test.getPort());
 
         if (!test.isStreaming()) {
-            x509Port.doubleIt(25);
+            assertEquals(50, x509Port.doubleIt(25));
         }
 
         ((java.io.Closeable)x509Port).close();
@@ -438,7 +438,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
         updateAddressPort(x509Port, test.getPort());
 
         if (!test.isStreaming()) {
-            x509Port.doubleIt(25);
+            assertEquals(50, x509Port.doubleIt(25));
         }
 
         ((java.io.Closeable)x509Port).close();
@@ -466,7 +466,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -490,7 +490,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
         updateAddressPort(x509Port, test.getPort());
 
         if (!test.isStreaming()) {
-            x509Port.doubleIt(25);
+            assertEquals(50, x509Port.doubleIt(25));
         }
 
         ((java.io.Closeable)x509Port).close();
@@ -518,7 +518,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -545,7 +545,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -572,7 +572,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -600,7 +600,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -627,7 +627,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -658,7 +658,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -685,7 +685,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -712,7 +712,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -739,7 +739,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -766,7 +766,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -793,7 +793,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -820,7 +820,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -847,7 +847,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -874,7 +874,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -902,7 +902,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
         }
 
         if (!test.isStreaming() && !STAX_PORT.equals(test.getPort())) {
-            x509Port.doubleIt(25);
+            assertEquals(50, x509Port.doubleIt(25));
         }
 
         ((java.io.Closeable)x509Port).close();
@@ -930,7 +930,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -959,7 +959,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
 
         // TODO WSS-456 Streaming
         if (!test.isStreaming()) {
-            x509Port.doubleIt(25);
+            assertEquals(50, x509Port.doubleIt(25));
         }
 
         ((java.io.Closeable)x509Port).close();
@@ -991,7 +991,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -1022,7 +1022,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -1053,7 +1053,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -1084,7 +1084,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -1115,7 +1115,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -1142,7 +1142,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -1169,7 +1169,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -1196,7 +1196,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -1223,7 +1223,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -1255,7 +1255,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
         cxfClient.getOutInterceptors().add(cacheInterceptor);
 
         // Make two invocations with the same security header
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
         try {
             x509Port.doubleIt(25);
             fail("Failure expected on a replayed Timestamp");
@@ -1292,7 +1292,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -1341,7 +1341,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             "alice.properties");
         ((BindingProvider)x509Port).getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, "alice");
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -1372,7 +1372,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -1495,7 +1495,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         // This should fail, as the client is not endorsing the token
         portQName = new QName(NAMESPACE, "DoubleItTransportNegativeEndorsingPort2");
@@ -1540,7 +1540,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -1567,7 +1567,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
@@ -1594,7 +1594,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(x509Port);
         }
 
-        x509Port.doubleIt(25);
+        assertEquals(50, x509Port.doubleIt(25));
 
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java
index f464860..a9e444f 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java
@@ -117,7 +117,7 @@ public class XKMSTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
@@ -147,7 +147,7 @@ public class XKMSTest extends AbstractBusClientServerTestBase {
             SecurityTestUtil.enableStreaming(port);
         }
 
-        port.doubleIt(25);
+        assertEquals(50, port.doubleIt(25));
 
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/DoubleItAction.wsdl b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/DoubleItAction.wsdl
index 9eb6888..5060aa3 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/DoubleItAction.wsdl
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/DoubleItAction.wsdl
@@ -84,6 +84,9 @@
         <wsdl:port name="DoubleItSignedSAMLPort" binding="tns:DoubleItNoSecurityBinding">
             <soap:address location="http://localhost:9001/DoubleItSignedSAML"/>
         </wsdl:port>
+        <wsdl:port name="DoubleItSignatureConfigPort" binding="tns:DoubleItNoSecurityBinding">
+            <soap:address location="http://localhost:9001/DoubleItSignatureConfig"/>
+        </wsdl:port>
     </wsdl:service>
     
 </wsdl:definitions>
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml
index d2447d8..e3f39be 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml
@@ -285,4 +285,17 @@
         </jaxws:inInterceptors>
     </jaxws:endpoint>
     
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SignatureConfig" address="<a href="http://localhost:$">http://localhost:${testutil.ports.action.Server}/DoubleItSignatureConfig" serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfigPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItAction.wsdl">
+        <jaxws:inInterceptors>
+            <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
+                <constructor-arg>
+                    <map>
+                        <entry key="action" value="Signature"/>
+                        <entry key="signatureVerificationPropFile" value="bob.properties"/>
+                    </map>
+                </constructor-arg>
+            </bean>
+        </jaxws:inInterceptors>
+    </jaxws:endpoint>
+    
 </beans>

--
To stop receiving notification emails like this one, please contact
[hidden email].