[ws-wss4j] 02/03: Fixing previous merge

[coheigea]

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

coheigea pushed a commit to branch 2_1_x-fixes
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git

commit e2cfb4287e962e5848bfbd9f986ee3195e744505
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Thu Jan 9 12:53:33 2020 +0000

    Fixing previous merge
---
 .../org/apache/wss4j/stax/test/SecurityContextTokenTest.java  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java
 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java
index 5751f75..7fac280 100644
--- 
a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java
+++ 
b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java
@@ -1132,10 +1132,11 @@ public class SecurityContextTokenTest extends 
AbstractTestBase {
             WSSecHeader secHeader = new WSSecHeader(doc);
             secHeader.insertSecurityHeader();
 
-            WSSecSecurityContextToken sctBuilder = new 
WSSecSecurityContextToken(secHeader, null);
+            WSSecSecurityContextToken sctBuilder = new 
WSSecSecurityContextToken();
+
             sctBuilder.setWscVersion(version);
             Crypto crypto = 
CryptoFactory.getInstance("transmitter-crypto.properties");
-            sctBuilder.prepare(crypto);
+            sctBuilder.prepare(doc, crypto);
 
             // Store the secret
             SecretKeyCallbackHandler callbackHandler = new 
SecretKeyCallbackHandler();
@@ -1143,15 +1144,15 @@ public class SecurityContextTokenTest extends 
AbstractTestBase {
 
             String tokenId = sctBuilder.getSctId();
 
-            WSSecSignature builder = new WSSecSignature(secHeader);
+            WSSecSignature builder = new WSSecSignature();
             builder.setSecretKey(tempSecret);
             builder.setKeyIdentifierType(WSConstants.CUSTOM_SYMM_SIGNING);
             builder.setCustomTokenValueType(WSConstants.WSC_SCT);
             builder.setCustomTokenId(tokenId);
             builder.setSignatureAlgorithm(SignatureMethod.HMAC_SHA1);
-            builder.build(crypto);
+            builder.build(doc, crypto, secHeader);
 
-            sctBuilder.prependSCTElementToHeader();
+            sctBuilder.prependSCTElementToHeader(doc, secHeader);
 
             javax.xml.transform.Transformer transformer = 
TRANSFORMER_FACTORY.newTransformer();
             transformer.transform(new DOMSource(doc), new StreamResult(baos));