commit e2cfb4287e962e5848bfbd9f986ee3195e744505
author Colm O hEigeartaigh <coheigea@apache.org> Thu Jan 09 12:53:33 2020 +0000
committer Colm O hEigeartaigh <coheigea@apache.org> Thu Jan 09 12:53:33 2020 +0000
tree 5d2f0ffdafcd917e749bc496c32579af088d5faa
parent 297eec733481e70ceecce85d73d7283f1cd46605

Fixing previous merge

ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java

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 @@
             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 @@
 
             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));