You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2020/05/22 16:00:23 UTC
[ws-wss4j] 03/03: Removing test cleanup code
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/ws-wss4j.git
commit 22d8bc3614f92ea39055d36f3bfe134e343fa40c
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri May 22 16:19:35 2020 +0100
Removing test cleanup code
---
.../wss4j/integration/test/kerberos/KerberosTest.java | 4 ++--
.../org/apache/wss4j/performance/AbstractTestBase.java | 2 +-
.../java/org/apache/wss4j/dom/common/SecurityTestUtil.java | 14 --------------
.../wss4j/dom/components/crypto/CertificateStoreTest.java | 9 ++-------
.../wss4j/dom/components/crypto/CryptoProviderTest.java | 9 ++-------
.../org/apache/wss4j/dom/components/crypto/CryptoTest.java | 9 ++-------
.../java/org/apache/wss4j/dom/handler/CallbackRefTest.java | 9 ++-------
.../wss4j/dom/handler/CustomActionProcessorTest.java | 9 ++-------
.../java/org/apache/wss4j/dom/handler/CustomTokenTest.java | 9 ++-------
.../org/apache/wss4j/dom/handler/ResultsOrderTest.java | 9 ++-------
.../apache/wss4j/dom/handler/SecurityActionTokenTest.java | 9 ++-------
.../wss4j/dom/handler/SignatureConfirmationTest.java | 9 ++-------
.../org/apache/wss4j/dom/handler/SignatureUTAliasTest.java | 9 ++-------
.../org/apache/wss4j/dom/handler/UseReqSigCertTest.java | 9 ++-------
.../apache/wss4j/dom/handler/WSHandlerGetPasswordTest.java | 9 ++-------
.../java/org/apache/wss4j/dom/message/CertErrorTest.java | 9 ++-------
.../org/apache/wss4j/dom/message/DerivedKeyActionTest.java | 9 ++-------
.../java/org/apache/wss4j/dom/message/DerivedKeyTest.java | 9 ++-------
.../wss4j/dom/message/EncryptedDataInHeaderTest.java | 9 ++-------
.../wss4j/dom/message/EncryptionAlgorithmSuiteTest.java | 9 ++-------
.../org/apache/wss4j/dom/message/EncryptionCRLTest.java | 9 ++-------
.../org/apache/wss4j/dom/message/EncryptionGCMTest.java | 9 ++-------
.../org/apache/wss4j/dom/message/EncryptionPartsTest.java | 9 ++-------
.../java/org/apache/wss4j/dom/message/EncryptionTest.java | 9 ++-------
.../org/apache/wss4j/dom/message/ModifiedRequestTest.java | 9 ++-------
.../wss4j/dom/message/NoSoapPrefixSignatureTest.java | 9 ++-------
.../apache/wss4j/dom/message/PasswordEncryptorTest.java | 9 ++-------
.../org/apache/wss4j/dom/message/PasswordTypeTest.java | 9 ++-------
.../test/java/org/apache/wss4j/dom/message/ReplayTest.java | 8 ++------
.../message/RequireSignedEncryptedDataElementsTest.java | 9 ++-------
.../org/apache/wss4j/dom/message/SKISignatureTest.java | 9 ++-------
.../org/apache/wss4j/dom/message/STRSignatureTest.java | 9 ++-------
.../apache/wss4j/dom/message/SecurityContextTokenTest.java | 9 ++-------
.../org/apache/wss4j/dom/message/SignatureAKITest.java | 9 ++-------
.../wss4j/dom/message/SignatureAlgorithmSuiteTest.java | 9 ++-------
.../org/apache/wss4j/dom/message/SignatureCRLTest.java | 9 ++-------
.../wss4j/dom/message/SignatureCertConstraintsTest.java | 9 ++-------
.../org/apache/wss4j/dom/message/SignatureCertTest.java | 9 ++-------
.../apache/wss4j/dom/message/SignatureEncryptionTest.java | 9 ++-------
.../dom/message/SignatureIssuerCertConstraintsTest.java | 9 ++-------
.../apache/wss4j/dom/message/SignatureKeyValueTest.java | 9 ++-------
.../org/apache/wss4j/dom/message/SignaturePartsTest.java | 9 ++-------
.../apache/wss4j/dom/message/SignaturePrefixListTest.java | 9 ++-------
.../apache/wss4j/dom/message/SignatureProviderTest.java | 9 ++-------
.../java/org/apache/wss4j/dom/message/SignatureTest.java | 9 ++-------
.../org/apache/wss4j/dom/message/SignatureWSS651Test.java | 9 ++-------
.../java/org/apache/wss4j/dom/message/SignedBSTTest.java | 9 ++-------
.../apache/wss4j/dom/message/SymmetricSignatureTest.java | 9 ++-------
.../apache/wss4j/dom/message/TestMessageTransformer.java | 9 ++-------
.../java/org/apache/wss4j/dom/message/TimestampTest.java | 10 ++--------
.../org/apache/wss4j/dom/message/UTDerivedKeyTest.java | 9 ++-------
.../java/org/apache/wss4j/dom/message/UTSignatureTest.java | 9 ++-------
.../org/apache/wss4j/dom/message/UsernameTokenTest.java | 9 ++-------
.../apache/wss4j/dom/message/token/BSTKerberosTest.java | 9 ++-------
.../wss4j/dom/message/token/BinarySecurityTokenTest.java | 9 ++-------
.../wss4j/dom/message/token/DerivedKeyTokenTest.java | 9 ++-------
.../org/apache/wss4j/dom/message/token/ReferenceTest.java | 9 ++-------
.../dom/message/token/SecurityTokenReferenceTest.java | 9 ++-------
.../wss4j/dom/message/token/WCFUsernameTokenTest.java | 9 ++-------
.../test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java | 9 ++-------
.../test/java/org/apache/wss4j/dom/misc/PrincipalTest.java | 9 ++-------
.../java/org/apache/wss4j/dom/misc/SecurityHeaderTest.java | 9 ++-------
.../wss4j/dom/processor/EncryptedKeyDataRefTest.java | 9 ++-------
.../wss4j/dom/processor/ReferenceListDataRefTest.java | 9 ++-------
.../org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java | 9 ++-------
.../test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java | 9 ++-------
.../java/org/apache/wss4j/dom/saml/SamlConditionsTest.java | 9 ++-------
.../java/org/apache/wss4j/dom/saml/SamlNegativeTest.java | 9 ++-------
.../java/org/apache/wss4j/dom/saml/SamlReferenceTest.java | 9 ++-------
.../org/apache/wss4j/dom/saml/SamlTokenActionTest.java | 9 ++-------
.../wss4j/dom/saml/SamlTokenCustomSignatureTest.java | 9 ++-------
.../org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java | 9 ++-------
.../java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java | 9 ++-------
.../java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java | 9 ++-------
.../test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java | 9 ++-------
.../org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java | 9 ++-------
.../apache/wss4j/dom/saml/ext/AssertionSigningTest.java | 9 ++-------
.../java/org/apache/wss4j/dom/validate/ValidatorTest.java | 9 ++-------
.../wss4j/policy/stax/test/AbstractPolicyTestBase.java | 9 ++-------
.../java/org/apache/wss4j/stax/test/AbstractTestBase.java | 9 ++-------
80 files changed, 157 insertions(+), 556 deletions(-)
diff --git a/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java b/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
index f91effe..693cd6d 100644
--- a/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
+++ b/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
@@ -50,7 +50,7 @@ import org.apache.wss4j.common.token.BinarySecurity;
import org.apache.wss4j.common.util.KeyUtils;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -73,6 +73,7 @@ import org.apache.wss4j.stax.test.utils.XmlReaderToWriter;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventListener;
+
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -146,7 +147,6 @@ public class KerberosTest {
@AfterAll
public static void tearDown() throws Exception {
- SecurityTestUtil.cleanup();
if (kerbyServer != null) {
kerbyServer.stop();
}
diff --git a/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java b/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java
index 997832d..83821e6 100644
--- a/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java
+++ b/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java
@@ -26,7 +26,7 @@ import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.WSSConfig;
import org.apache.wss4j.dom.WSSecurityEngineResult;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.handler.HandlerAction;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandler;
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SecurityTestUtil.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SecurityTestUtil.java
index 8eb1b35..1867781 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SecurityTestUtil.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SecurityTestUtil.java
@@ -34,20 +34,6 @@ public final class SecurityTestUtil {
// complete
}
- public static void cleanup() {
-// String tmpDir = System.getProperty("java.io.tmpdir");
-// if (tmpDir != null) {
-// File[] tmpFiles = new File(tmpDir).listFiles();
-// if (tmpFiles != null) {
-// for (File tmpFile : tmpFiles) {
-// if (tmpFile.exists() && tmpFile.getName().endsWith(".data")) {
-// tmpFile.delete();
-// }
-// }
-// }
-// }
- }
-
public static ReplayCache createCache(String key) throws WSSecurityException {
String diskKey = key + "-" + Math.abs(new Random().nextInt());
File diskstore = new File(System.getProperty("java.io.tmpdir"), diskKey);
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java
index 656925c..feba7dc 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java
@@ -22,7 +22,7 @@ package org.apache.wss4j.dom.components.crypto;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -37,7 +37,7 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.message.WSSecHeader;
import org.apache.wss4j.dom.message.WSSecSignature;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -63,11 +63,6 @@ public class CertificateStoreTest {
private Crypto receiverCrypto;
private CallbackHandler keystoreCallbackHandler = new KeystoreCallbackHandler();
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public CertificateStoreTest() throws Exception {
CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS);
cryptoType.setAlias("wss40");
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java
index 65d220f..4b68e70 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java
@@ -22,7 +22,7 @@ package org.apache.wss4j.dom.components.crypto;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
@@ -33,7 +33,7 @@ import org.apache.wss4j.dom.message.WSSecEncrypt;
import org.apache.wss4j.dom.message.WSSecHeader;
import org.apache.wss4j.dom.message.WSSecSignature;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -76,11 +76,6 @@ public class CryptoProviderTest {
crypto = CryptoFactory.getInstance("wss86.properties");
}
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
/**
* Test signing a SOAP message using a cert with an OID
*/
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoTest.java
index e8a5742..453c2d3 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoTest.java
@@ -26,7 +26,7 @@ import java.util.Properties;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.CustomCrypto;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.common.crypto.Crypto;
@@ -36,7 +36,7 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.Loader;
import org.apache.wss4j.dom.message.WSSecHeader;
import org.apache.wss4j.dom.message.WSSecSignature;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -51,11 +51,6 @@ public class CryptoTest {
WSSConfig.init();
}
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
@Test
public void testCrypto() throws Exception {
Crypto crypto = CryptoFactory.getInstance();
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CallbackRefTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CallbackRefTest.java
index 764ad3d..65b7cb6 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CallbackRefTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CallbackRefTest.java
@@ -24,10 +24,10 @@ import java.util.Collections;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler;
import org.apache.wss4j.dom.engine.WSSConfig;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.apache.wss4j.common.util.XMLUtils;
import org.w3c.dom.Document;
@@ -46,11 +46,6 @@ public class CallbackRefTest {
org.slf4j.LoggerFactory.getLogger(CallbackRefTest.class);
private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler();
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
/**
* A test for WSHandler.getPassword(...), where the password is obtained from a
* Callback Handler, which is placed on the Message Context using a reference.
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java
index 3a7f4e5..b299427 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java
@@ -24,7 +24,7 @@ import org.apache.wss4j.dom.common.CustomAction;
import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.CustomProcessor;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -35,7 +35,7 @@ import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.message.WSSecSignature;
import org.apache.wss4j.dom.message.WSSecHeader;
import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -55,11 +55,6 @@ public class CustomActionProcessorTest {
org.slf4j.LoggerFactory.getLogger(CustomActionProcessorTest.class);
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public CustomActionProcessorTest() throws Exception {
WSSConfig.init();
crypto = CryptoFactory.getInstance();
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomTokenTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomTokenTest.java
index f4ca652..defaf7b 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomTokenTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomTokenTest.java
@@ -33,13 +33,13 @@ import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.message.WSSecTimestamp;
import org.apache.wss4j.dom.message.token.Timestamp;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -54,11 +54,6 @@ public class CustomTokenTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(CustomTokenTest.class);
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
// Add a Timestamp via a "Custom Token"
@Test
public void testCustomTokenTimestamp() throws Exception {
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/ResultsOrderTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/ResultsOrderTest.java
index 0c918a0..4cb38a8 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/ResultsOrderTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/ResultsOrderTest.java
@@ -21,9 +21,9 @@ package org.apache.wss4j.dom.handler;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.CustomHandler;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -36,11 +36,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*/
public class ResultsOrderTest {
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
/**
*/
@Test
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java
index 6a15835..98f05cb 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java
@@ -42,11 +42,11 @@ import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
import org.apache.wss4j.dom.common.SecretKeyCallbackHandler;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.xml.security.stax.impl.util.IDGenerator;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -62,11 +62,6 @@ public class SecurityActionTokenTest {
private Crypto crypto;
private byte[] keyData;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
@BeforeEach
public void setUp() throws Exception {
KeyGenerator keyGen = KeyGenerator.getInstance("AES");
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java
index 998b21a..f4b4065 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java
@@ -37,13 +37,13 @@ import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SAML2CallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.message.WSSecHeader;
import org.apache.wss4j.dom.message.token.SignatureConfirmation;
import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -64,11 +64,6 @@ public class SignatureConfirmationTest {
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SignatureConfirmationTest() throws Exception {
crypto = CryptoFactory.getInstance();
}
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java
index d5fa887..79ba660 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java
@@ -30,10 +30,10 @@ import javax.security.auth.callback.UnsupportedCallbackException;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSPasswordCallback;
@@ -50,11 +50,6 @@ public class SignatureUTAliasTest implements CallbackHandler {
org.slf4j.LoggerFactory.getLogger(SignatureUTAliasTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
/**
* Test involving adding a Username Token to a SOAP message and signing it, where the
* private key for signature is extracted from the KeyStore using a different username/alias
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java
index 1718bf8..d867e9f 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java
@@ -29,10 +29,10 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -45,11 +45,6 @@ public class UseReqSigCertTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(UseReqSigCertTest.class);
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public UseReqSigCertTest() throws Exception {
WSSConfig.init();
}
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/WSHandlerGetPasswordTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/WSHandlerGetPasswordTest.java
index b4c2ad1..eec81bc 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/WSHandlerGetPasswordTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/WSHandlerGetPasswordTest.java
@@ -24,10 +24,10 @@ import java.util.Collections;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler;
import org.apache.wss4j.dom.engine.WSSConfig;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.apache.wss4j.common.ext.WSPasswordCallback;
import org.apache.wss4j.common.util.XMLUtils;
@@ -46,11 +46,6 @@ public class WSHandlerGetPasswordTest {
org.slf4j.LoggerFactory.getLogger(WSHandlerGetPasswordTest.class);
private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler();
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
/**
* A unit test for WSHandler.getPassword(...), where the password is obtained
* from the Message Context.
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java
index 3d2bfe3..da828c6 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java
@@ -21,9 +21,9 @@ package org.apache.wss4j.dom.message;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
@@ -43,11 +43,6 @@ import javax.crypto.SecretKey;
*/
public class CertErrorTest {
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public CertErrorTest() {
WSSConfig.init();
}
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyActionTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyActionTest.java
index abd282c..364dfdf 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyActionTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyActionTest.java
@@ -37,14 +37,14 @@ import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
import org.apache.wss4j.dom.common.SecretKeyCallbackHandler;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.handler.HandlerAction;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -59,11 +59,6 @@ public class DerivedKeyActionTest {
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public DerivedKeyActionTest() throws Exception {
crypto = CryptoFactory.getInstance("wss40.properties");
WSSConfig.init();
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java
index 01407cc..ca84198 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java
@@ -22,12 +22,12 @@ package org.apache.wss4j.dom.message;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.WSHandlerResult;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
@@ -57,11 +57,6 @@ public class DerivedKeyTest {
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public DerivedKeyTest() throws Exception {
crypto = CryptoFactory.getInstance("wss40.properties");
WSSConfig.init();
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java
index 136ee4d..9a4bb5d 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java
@@ -26,7 +26,7 @@ import javax.security.auth.callback.CallbackHandler;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -37,7 +37,7 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.util.KeyUtils;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -59,11 +59,6 @@ public class EncryptedDataInHeaderTest {
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public EncryptedDataInHeaderTest() throws Exception {
crypto = CryptoFactory.getInstance();
WSSConfig.init();
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java
index 234e9eb..70ae453 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java
@@ -32,13 +32,13 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
import org.apache.wss4j.dom.common.SecretKeyCallbackHandler;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -56,11 +56,6 @@ public class EncryptionAlgorithmSuiteTest {
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public EncryptionAlgorithmSuiteTest() throws Exception {
WSSConfig.init();
crypto = CryptoFactory.getInstance("wss40.properties");
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionCRLTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionCRLTest.java
index 27f6e28..049665c 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionCRLTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionCRLTest.java
@@ -28,7 +28,7 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.common.EncryptionActionToken;
@@ -39,7 +39,7 @@ import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.handler.HandlerAction;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -60,11 +60,6 @@ public class EncryptionCRLTest {
private CallbackHandler keystoreCallbackHandler = new KeystoreCallbackHandler();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public EncryptionCRLTest() throws Exception {
crypto = CryptoFactory.getInstance("wss40All.properties");
}
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java
index c26ceb8..d48c7a2 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java
@@ -28,7 +28,7 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.WSDataRef;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -39,7 +39,7 @@ import org.apache.wss4j.common.util.KeyUtils;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerResult;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -72,11 +72,6 @@ public class EncryptionGCMTest {
private boolean isIBMJdK = System.getProperty("java.vendor").contains("IBM");
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public EncryptionGCMTest() throws Exception {
crypto = CryptoFactory.getInstance("wss40.properties");
}
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java
index 4ee9684..d414135 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java
@@ -24,7 +24,7 @@ import org.apache.wss4j.dom.WSDataRef;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -36,7 +36,7 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.KeyUtils;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -88,11 +88,6 @@ public class EncryptionPartsTest {
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public EncryptionPartsTest() throws Exception {
crypto = CryptoFactory.getInstance();
WSSConfig.init();
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
index 5ceb41b..1046648 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
@@ -43,7 +43,7 @@ import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
import org.apache.wss4j.dom.common.SecretKeyCallbackHandler;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -53,7 +53,7 @@ import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.str.STRParser.REFERENCE_TYPE;
import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -84,11 +84,6 @@ public class EncryptionTest {
private SecretKey key;
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public EncryptionTest() throws Exception {
crypto = CryptoFactory.getInstance("wss40.properties");
}
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java
index 9f4e55e..d0d3a64 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java
@@ -42,7 +42,7 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SAML1CallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -50,7 +50,7 @@ import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.saml.WSSecSignatureSAML;
import org.apache.wss4j.dom.util.SignatureUtils;
import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -82,11 +82,6 @@ public class ModifiedRequestTest {
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public ModifiedRequestTest() throws Exception {
WSSConfig.init();
crypto = CryptoFactory.getInstance();
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java
index f075238..eea7fd3 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java
@@ -21,10 +21,10 @@ package org.apache.wss4j.dom.message;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
@@ -41,11 +41,6 @@ public class NoSoapPrefixSignatureTest {
private WSSecurityEngine secEngine = new WSSecurityEngine();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public NoSoapPrefixSignatureTest() throws Exception {
WSSConfig.init();
crypto = CryptoFactory.getInstance();
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java
index 9ee2c65..adfaeff 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java
@@ -37,14 +37,14 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.handler.HandlerAction;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -65,11 +65,6 @@ public class PasswordEncryptorTest {
new JasyptPasswordEncryptor("this-is-a-secret");
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public PasswordEncryptorTest() throws Exception {
WSSConfig.init();
Properties properties =
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java
index 3f100b8..adffde8 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java
@@ -24,7 +24,7 @@ import java.util.Collections;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.common.ext.WSSecurityException;
@@ -32,7 +32,7 @@ import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.handler.HandlerAction;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -50,11 +50,6 @@ public class PasswordTypeTest {
org.slf4j.LoggerFactory.getLogger(PasswordTypeTest.class);
private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler();
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
/**
* Test that adds a UserNameToken with password Digest to a WS-Security envelope
*/
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java
index f1fa26b..7342b7e 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java
@@ -27,6 +27,7 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SAML2CallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
+
import org.apache.wss4j.dom.common.SecurityTestUtil;
import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler;
import org.apache.wss4j.dom.engine.WSSConfig;
@@ -47,7 +48,7 @@ import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.util.WSSecurityUtil;
import org.apache.wss4j.dom.validate.SamlAssertionValidator;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -65,11 +66,6 @@ public class ReplayTest {
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public ReplayTest() throws Exception {
crypto = CryptoFactory.getInstance();
}
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java
index b0333f5..da3f912 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java
@@ -32,7 +32,7 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.common.crypto.Crypto;
@@ -44,7 +44,7 @@ import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -78,11 +78,6 @@ public class RequireSignedEncryptedDataElementsTest {
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public RequireSignedEncryptedDataElementsTest() throws Exception {
crypto = CryptoFactory.getInstance();
WSSConfig.init();
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SKISignatureTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SKISignatureTest.java
index 8838adb..9db0165 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SKISignatureTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SKISignatureTest.java
@@ -21,7 +21,7 @@ package org.apache.wss4j.dom.message;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -30,7 +30,7 @@ import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.str.STRParser.REFERENCE_TYPE;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -46,11 +46,6 @@ public class SKISignatureTest {
private WSSecurityEngine secEngine = new WSSecurityEngine();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SKISignatureTest() throws Exception {
WSSConfig.init();
crypto = CryptoFactory.getInstance("wss40.properties");
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java
index 0b6403c..8e76e78 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java
@@ -22,10 +22,10 @@ package org.apache.wss4j.dom.message;
import org.apache.wss4j.dom.SOAPConstants;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.common.WSEncryptionPart;
@@ -44,11 +44,6 @@ public class STRSignatureTest {
private WSSecurityEngine secEngine = new WSSecurityEngine();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public STRSignatureTest() throws Exception {
WSSConfig.init();
crypto = CryptoFactory.getInstance("wss40.properties");
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SecurityContextTokenTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SecurityContextTokenTest.java
index 09ffdbf..08c6712 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SecurityContextTokenTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SecurityContextTokenTest.java
@@ -24,7 +24,7 @@ import javax.xml.crypto.dsig.SignatureMethod;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.SecretKeyCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.WSHandlerResult;
@@ -34,7 +34,7 @@ import org.apache.wss4j.common.derivedKey.ConversationConstants;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.message.token.SecurityContextToken;
import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -56,11 +56,6 @@ public class SecurityContextTokenTest {
crypto = CryptoFactory.getInstance("wss40.properties");
}
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
@Test
public void testBuild() {
try {
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAKITest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAKITest.java
index d5bba84..00697bf 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAKITest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAKITest.java
@@ -30,12 +30,12 @@ import org.apache.wss4j.common.util.Loader;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.WSHandlerResult;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -51,11 +51,6 @@ public class SignatureAKITest {
private WSSecurityEngine secEngine = new WSSecurityEngine();
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SignatureAKITest() throws Exception {
WSSConfig.init();
}
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java
index a987dfc..086f2c8 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java
@@ -37,13 +37,13 @@ import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.SOAPUtil;
import org.apache.wss4j.dom.common.SecretKeyCallbackHandler;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -61,11 +61,6 @@ public class SignatureAlgorithmSuiteTest {
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SignatureAlgorithmSuiteTest() throws Exception {
WSSConfig.init();
crypto = CryptoFactory.getInstance();
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java
index c4ea47d..b89e257 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java
@@ -23,7 +23,7 @@ import java.security.cert.X509Certificate;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -34,7 +34,7 @@ import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -75,11 +75,6 @@ public class SignatureCRLTest {
private Crypto crypto;
private Crypto cryptoCA;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SignatureCRLTest() throws Exception {
WSSConfig.init();
crypto = CryptoFactory.getInstance("wss40rev.properties");
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java
index b73d76f..5608cb4 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java
@@ -24,7 +24,7 @@ import java.util.regex.Pattern;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.common.crypto.Crypto;
@@ -34,7 +34,7 @@ import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -53,11 +53,6 @@ public class SignatureCertConstraintsTest {
private Crypto crypto;
private Crypto cryptoCA;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SignatureCertConstraintsTest() throws Exception {
WSSConfig.init();
crypto = CryptoFactory.getInstance("wss40.properties");
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java
index 9e0c461..47f3a49 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java
@@ -22,7 +22,7 @@ package org.apache.wss4j.dom.message;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -35,7 +35,7 @@ import org.apache.wss4j.dom.handler.HandlerAction;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -82,11 +82,6 @@ public class SignatureCertTest {
private Crypto crypto;
private Crypto cryptoCA;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SignatureCertTest() throws Exception {
WSSConfig.init();
crypto = CryptoFactory.getInstance("wss40.properties");
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java
index 21ca109..5c6633c 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java
@@ -24,7 +24,7 @@ import org.apache.wss4j.dom.WSDataRef;
import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -32,7 +32,7 @@ import org.apache.wss4j.dom.handler.HandlerAction;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.apache.wss4j.common.WSEncryptionPart;
import org.apache.wss4j.common.crypto.Crypto;
@@ -89,11 +89,6 @@ public class SignatureEncryptionTest {
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SignatureEncryptionTest() throws Exception {
crypto = CryptoFactory.getInstance("wss40.properties");
WSSConfig.init();
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureIssuerCertConstraintsTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureIssuerCertConstraintsTest.java
index ee004a1..0c09f02 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureIssuerCertConstraintsTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureIssuerCertConstraintsTest.java
@@ -28,13 +28,13 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -53,11 +53,6 @@ public class SignatureIssuerCertConstraintsTest {
private Crypto crypto;
private Crypto cryptoCA;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SignatureIssuerCertConstraintsTest() throws Exception {
WSSConfig.init();
crypto = CryptoFactory.getInstance("wss40.properties");
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java
index d91fc10..2209386 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java
@@ -30,13 +30,13 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerResult;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -53,11 +53,6 @@ public class SignatureKeyValueTest {
org.slf4j.LoggerFactory.getLogger(SignatureKeyValueTest.class);
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SignatureKeyValueTest() throws Exception {
WSSConfig.init();
crypto = CryptoFactory.getInstance("wss40.properties");
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java
index ed96502..2621035 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java
@@ -27,7 +27,7 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.SAML1CallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -47,7 +47,7 @@ import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.saml.SignedSamlTokenHOKTest;
import org.apache.wss4j.dom.saml.WSSecSignatureSAML;
import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -95,11 +95,6 @@ public class SignaturePartsTest {
private WSSecurityEngine secEngine = new WSSecurityEngine();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SignaturePartsTest() throws Exception {
WSSConfig.init();
crypto = CryptoFactory.getInstance();
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePrefixListTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePrefixListTest.java
index b2accfb..57df122 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePrefixListTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePrefixListTest.java
@@ -38,12 +38,12 @@ import org.apache.wss4j.common.crypto.CryptoType;
import org.apache.wss4j.common.util.Loader;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.WSHandlerResult;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -62,11 +62,6 @@ public class SignaturePrefixListTest {
private WSSecurityEngine secEngine = new WSSecurityEngine();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SignaturePrefixListTest() throws Exception {
WSSConfig.init();
crypto = CryptoFactory.getInstance();
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureProviderTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureProviderTest.java
index fce0081..2449af9 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureProviderTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureProviderTest.java
@@ -28,7 +28,7 @@ import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -37,7 +37,7 @@ import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.str.STRParser.REFERENCE_TYPE;
import org.apache.wss4j.dom.util.WSSecurityUtil;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -52,11 +52,6 @@ public class SignatureProviderTest {
private WSSecurityEngine secEngine = new WSSecurityEngine();
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SignatureProviderTest() throws Exception {
WSSConfig.init();
}
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java
index b6bbaf4..aad51d2 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java
@@ -48,7 +48,7 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -58,7 +58,7 @@ import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.str.STRParser.REFERENCE_TYPE;
import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -80,11 +80,6 @@ public class SignatureTest {
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SignatureTest() throws Exception {
WSSConfig.init();
crypto = CryptoFactory.getInstance();
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureWSS651Test.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureWSS651Test.java
index 22f9134..c8c6551 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureWSS651Test.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureWSS651Test.java
@@ -27,11 +27,11 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.handler.WSHandlerResult;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -61,11 +61,6 @@ public class SignatureWSS651Test {
private WSSecurityEngine secEngine = new WSSecurityEngine();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SignatureWSS651Test() throws Exception {
WSSConfig.init();
crypto = CryptoFactory.getInstance();
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java
index 15c72fa..36e9753 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java
@@ -32,7 +32,7 @@ import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.handler.HandlerAction;
@@ -40,7 +40,7 @@ import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -57,11 +57,6 @@ public class SignedBSTTest {
private WSSecurityEngine secEngine = new WSSecurityEngine();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SignedBSTTest() throws Exception {
WSSConfig.init();
crypto = CryptoFactory.getInstance("wss40.properties");
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SymmetricSignatureTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SymmetricSignatureTest.java
index b34189b..6c1469e 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SymmetricSignatureTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SymmetricSignatureTest.java
@@ -34,7 +34,7 @@ import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
import org.apache.wss4j.dom.common.SecretKeyCallbackHandler;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.common.crypto.Crypto;
@@ -45,7 +45,7 @@ import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.handler.HandlerAction;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -65,11 +65,6 @@ public class SymmetricSignatureTest implements CallbackHandler {
private byte[] keyData;
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SymmetricSignatureTest() throws Exception {
WSSConfig.init();
crypto = CryptoFactory.getInstance("wss40.properties");
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TestMessageTransformer.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TestMessageTransformer.java
index c0f9323..46e1ba1 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TestMessageTransformer.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TestMessageTransformer.java
@@ -28,8 +28,8 @@ import javax.xml.namespace.QName;
import javax.xml.transform.TransformerException;
import org.apache.wss4j.common.util.XMLUtils;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
-import org.junit.jupiter.api.AfterAll;
+
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -42,11 +42,6 @@ import org.w3c.dom.NodeList;
public class TestMessageTransformer {
private static final org.slf4j.Logger LOG = org.slf4j.LoggerFactory.getLogger(TestMessageTransformer.class);
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public static Element duplicateEncryptedDataInWsseHeader(Element saaj, boolean moveReferenceList) throws TransformerException, IOException {
if (moveReferenceList) {
moveReferenceList(saaj);
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java
index b73c670..e483f4b 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java
@@ -35,7 +35,7 @@ import org.apache.wss4j.common.util.WSTimeSource;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -43,7 +43,7 @@ import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.message.token.Timestamp;
import org.apache.wss4j.dom.validate.NoOpValidator;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -59,12 +59,6 @@ public class TimestampTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(TimestampTest.class);
-
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
/**
* This is a test for processing a valid Timestamp.
*/
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java
index 6f54468..9b6a1a4 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java
@@ -35,7 +35,7 @@ import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.EncodedPasswordCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler;
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
@@ -44,7 +44,7 @@ import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.message.token.UsernameToken;
import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -64,11 +64,6 @@ public class UTDerivedKeyTest {
private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public UTDerivedKeyTest() throws Exception {
crypto = CryptoFactory.getInstance();
}
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java
index bd18cce..e5ceb7a 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java
@@ -22,7 +22,7 @@ package org.apache.wss4j.dom.message;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler;
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
@@ -36,7 +36,7 @@ import org.apache.wss4j.dom.handler.HandlerAction;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -62,11 +62,6 @@ public class UTSignatureTest {
private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public UTSignatureTest() throws Exception {
crypto = CryptoFactory.getInstance();
}
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java
index 9b06b12..6ac1257 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java
@@ -43,7 +43,7 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.EncodedPasswordCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -52,7 +52,7 @@ import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.message.token.UsernameToken;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -124,11 +124,6 @@ public class UsernameTokenTest implements CallbackHandler {
private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler();
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
/**
* Test that adds a UserNameToken with password Digest to a WS-Security envelope
*/
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java
index e60f7ee..6c03ce5 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java
@@ -22,7 +22,7 @@ package org.apache.wss4j.dom.message.token;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -42,7 +42,7 @@ import org.apache.wss4j.dom.message.WSSecTimestamp;
import org.apache.wss4j.dom.util.WSSecurityUtil;
import org.apache.wss4j.dom.validate.Credential;
import org.apache.wss4j.dom.validate.Validator;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -70,11 +70,6 @@ public class BSTKerberosTest {
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public BSTKerberosTest() throws Exception {
WSSConfig.init();
crypto = CryptoFactory.getInstance();
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java
index f8feeee..af3d5b5 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java
@@ -21,7 +21,7 @@ package org.apache.wss4j.dom.message.token;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -37,7 +37,7 @@ import org.apache.wss4j.common.token.X509Security;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.message.WSSecHeader;
import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -55,11 +55,6 @@ public class BinarySecurityTokenTest {
org.slf4j.LoggerFactory.getLogger(BinarySecurityTokenTest.class);
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public BinarySecurityTokenTest() throws Exception {
crypto = CryptoFactory.getInstance("wss40.properties");
}
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/DerivedKeyTokenTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/DerivedKeyTokenTest.java
index eb77e99..7239979 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/DerivedKeyTokenTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/DerivedKeyTokenTest.java
@@ -20,8 +20,8 @@
package org.apache.wss4j.dom.message.token;
import org.apache.wss4j.common.bsp.BSPEnforcer;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
-import org.junit.jupiter.api.AfterAll;
+
+
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -55,11 +55,6 @@ public class DerivedKeyTokenTest {
private DerivedKeyToken tokenEqual;
private DerivedKeyToken tokenNotEqual;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public DerivedKeyTokenTest() throws Exception {
token = new DerivedKeyToken(createReferenceDocument(
TEST_TOKEN_TEMPLATE,
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/ReferenceTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/ReferenceTest.java
index 41a9cad..508aa05 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/ReferenceTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/ReferenceTest.java
@@ -21,9 +21,9 @@ package org.apache.wss4j.dom.message.token;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.token.Reference;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -60,11 +60,6 @@ public class ReferenceTest {
private Reference refEqual;
private Reference refNotEqual;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public ReferenceTest() throws Exception{
ref = new Reference (createReferenceDocument(TEST_REFERENCE_TEMPLATE, "test", "equalscheck").getDocumentElement());
refEqual = new Reference (createReferenceDocument(TEST_REFERENCE_TEMPLATE, "test", "equalscheck").getDocumentElement());
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java
index 02ab50b..e260dec 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java
@@ -29,9 +29,9 @@ import org.apache.wss4j.common.token.SecurityTokenReference;
import org.apache.wss4j.common.util.DOM2Writer;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -46,11 +46,6 @@ public class SecurityTokenReferenceTest {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SecurityTokenReferenceTest.class);
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SecurityTokenReferenceTest() {
WSSConfig.init();
}
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java
index d359523..d2f15ab 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java
@@ -29,13 +29,13 @@ import org.apache.wss4j.common.bsp.BSPRule;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler;
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerResult;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -72,11 +72,6 @@ public class WCFUsernameTokenTest {
private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler();
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
/**
* Test that adds a UserNameToken with a namespace qualified type. This should fail
* as WSS4J rejects these tokens by default.
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java
index 823139d..f5c403a 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java
@@ -37,7 +37,7 @@ import org.apache.wss4j.common.token.Reference;
import org.apache.wss4j.common.util.KeyUtils;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.message.WSSecEncrypt;
@@ -45,7 +45,7 @@ import org.apache.wss4j.dom.message.WSSecHeader;
import org.apache.wss4j.dom.message.WSSecTimestamp;
import org.apache.wss4j.dom.message.WSSecUsernameToken;
import org.apache.wss4j.dom.message.token.UsernameToken;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -61,11 +61,6 @@ public class FaultCodeTest implements CallbackHandler {
private WSSecurityEngine secEngine = new WSSecurityEngine();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public FaultCodeTest() throws Exception {
crypto = CryptoFactory.getInstance("wss40.properties");
WSSConfig.init();
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java
index 5e8f1ac..357e226 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java
@@ -42,7 +42,7 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.SAML1CallbackHandler;
import org.apache.wss4j.dom.common.SAML2CallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler;
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
@@ -55,7 +55,7 @@ import org.apache.wss4j.dom.message.WSSecUsernameToken;
import org.apache.wss4j.dom.util.WSSecurityUtil;
import org.apache.wss4j.dom.validate.Credential;
import org.apache.wss4j.dom.validate.Validator;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -71,11 +71,6 @@ public class PrincipalTest {
private CallbackHandler callbackHandler = new UsernamePasswordCallbackHandler();
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
/**
* Test the principal that is created after processing a Username Token
*/
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/SecurityHeaderTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/SecurityHeaderTest.java
index 7feab76..1a0e083 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/SecurityHeaderTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/SecurityHeaderTest.java
@@ -20,9 +20,9 @@
package org.apache.wss4j.dom.misc;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSecurityEngine;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.w3c.dom.Document;
@@ -88,11 +88,6 @@ public class SecurityHeaderTest {
private WSSecurityEngine secEngine = new WSSecurityEngine();
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
/**
* Test for processing multiple security headers with the same (null) actor
*/
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java
index 01bde53..c94c6bd 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java
@@ -29,7 +29,7 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.WSDataRef;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -40,7 +40,7 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.util.KeyUtils;
import org.apache.wss4j.dom.message.WSSecEncrypt;
import org.apache.wss4j.dom.message.WSSecHeader;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -69,11 +69,6 @@ public class EncryptedKeyDataRefTest {
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public EncryptedKeyDataRefTest() throws Exception {
crypto = CryptoFactory.getInstance("wss40.properties");
WSSConfig.init();
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java
index 63f6a16..79d5251 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java
@@ -29,7 +29,7 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.WSDataRef;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -40,7 +40,7 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.util.KeyUtils;
import org.apache.wss4j.dom.message.WSSecEncrypt;
import org.apache.wss4j.dom.message.WSSecHeader;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -69,11 +69,6 @@ public class ReferenceListDataRefTest {
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public ReferenceListDataRefTest() throws Exception {
crypto = CryptoFactory.getInstance("wss40.properties");
WSSConfig.init();
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java
index d6bdc7e..d512a29 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java
@@ -30,7 +30,7 @@ import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.SAML1CallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.handler.RequestData;
@@ -42,7 +42,7 @@ import org.apache.wss4j.common.saml.SAMLUtil;
import org.apache.wss4j.common.saml.builder.SAML1Constants;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -57,11 +57,6 @@ public class SamlAlgorithmSuiteTest {
org.slf4j.LoggerFactory.getLogger(SamlAlgorithmSuiteTest.class);
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SamlAlgorithmSuiteTest() throws Exception {
WSSConfig.init();
crypto = CryptoFactory.getInstance("crypto.properties");
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java
index ce411cf..bf507c1 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java
@@ -31,7 +31,7 @@ import org.apache.wss4j.dom.common.CustomSamlAssertionValidator;
import org.apache.wss4j.dom.common.SAML1CallbackHandler;
import org.apache.wss4j.dom.common.SAML2CallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.handler.RequestData;
@@ -39,7 +39,7 @@ import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.message.WSSecHeader;
import org.apache.wss4j.dom.message.WSSecSAMLToken;
import org.joda.time.DateTime;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -55,11 +55,6 @@ public class SamlAuthnTest {
org.slf4j.LoggerFactory.getLogger(SamlAuthnTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SamlAuthnTest() {
WSSConfig config = WSSConfig.getNewInstance();
config.setValidator(WSConstants.SAML_TOKEN, new CustomSamlAssertionValidator());
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java
index 26df061..088fad8 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java
@@ -41,7 +41,7 @@ import org.apache.wss4j.dom.common.CustomSamlAssertionValidator;
import org.apache.wss4j.dom.common.SAML1CallbackHandler;
import org.apache.wss4j.dom.common.SAML2CallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.handler.RequestData;
@@ -49,7 +49,7 @@ import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.message.WSSecHeader;
import org.apache.wss4j.dom.message.WSSecSAMLToken;
import org.joda.time.DateTime;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -65,11 +65,6 @@ public class SamlConditionsTest {
org.slf4j.LoggerFactory.getLogger(SamlConditionsTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SamlConditionsTest() {
WSSConfig config = WSSConfig.getNewInstance();
config.setValidator(WSConstants.SAML_TOKEN, new CustomSamlAssertionValidator());
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java
index 6f7caab..ae27f98 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java
@@ -26,7 +26,7 @@ import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SAML1CallbackHandler;
import org.apache.wss4j.dom.common.SAML2CallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.handler.RequestData;
@@ -46,7 +46,7 @@ import org.apache.wss4j.common.util.Loader;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.message.WSSecHeader;
import org.apache.wss4j.dom.message.WSSecSAMLToken;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -77,11 +77,6 @@ public class SamlNegativeTest {
private Crypto issuerCrypto;
private Crypto userCrypto = CryptoFactory.getInstance("wss40.properties");
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SamlNegativeTest() throws Exception {
WSSConfig config = WSSConfig.getNewInstance();
secEngine.setWssConfig(config);
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java
index 643e0a2..07534ca 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java
@@ -27,7 +27,7 @@ import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SAML1CallbackHandler;
import org.apache.wss4j.dom.common.SAML2CallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -45,7 +45,7 @@ import org.apache.wss4j.common.util.Loader;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.message.WSSecEncrypt;
import org.apache.wss4j.dom.message.WSSecHeader;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -77,11 +77,6 @@ public class SamlReferenceTest {
private Crypto issuerCrypto;
private Crypto userCrypto = CryptoFactory.getInstance("wss40.properties");
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SamlReferenceTest() throws Exception {
WSSConfig config = WSSConfig.getNewInstance();
secEngine.setWssConfig(config);
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java
index 805ae90..dead6ed 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java
@@ -38,7 +38,7 @@ import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SAML1CallbackHandler;
import org.apache.wss4j.dom.common.SAML2CallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -46,7 +46,7 @@ import org.apache.wss4j.dom.handler.HandlerAction;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -62,11 +62,6 @@ public class SamlTokenActionTest {
private WSSecurityEngine secEngine = new WSSecurityEngine();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SamlTokenActionTest() throws WSSecurityException {
WSSConfig config = WSSConfig.getNewInstance();
crypto = CryptoFactory.getInstance("wss40.properties");
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java
index 35533ec..2521c15 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java
@@ -45,7 +45,7 @@ import org.apache.wss4j.dom.common.CustomHandler;
import org.apache.wss4j.dom.common.SAML1CallbackHandler;
import org.apache.wss4j.dom.common.SAML2CallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.handler.HandlerAction;
@@ -60,7 +60,7 @@ import org.apache.xml.security.signature.XMLSignature;
import org.apache.xml.security.transforms.Transforms;
import org.apache.xml.security.transforms.params.XPath2FilterContainer;
import org.apache.xml.security.utils.Constants;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -76,11 +76,6 @@ public class SamlTokenCustomSignatureTest {
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SamlTokenCustomSignatureTest() throws Exception {
WSSConfig.init();
crypto = CryptoFactory.getInstance("crypto.properties");
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java
index 32ceca1..594f286 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java
@@ -40,7 +40,7 @@ import org.apache.wss4j.dom.WSDataRef;
import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SAML1CallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -49,7 +49,7 @@ import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.message.WSSecDKSign;
import org.apache.wss4j.dom.message.WSSecHeader;
import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -69,11 +69,6 @@ public class SamlTokenDerivedTest {
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SamlTokenDerivedTest() throws Exception {
WSSConfig config = WSSConfig.getNewInstance();
secEngine.setWssConfig(config);
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java
index b234089..c98780f 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java
@@ -25,7 +25,7 @@ import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SAML1CallbackHandler;
import org.apache.wss4j.dom.common.SAML2CallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -40,7 +40,7 @@ import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.message.WSSecHeader;
import org.apache.wss4j.dom.message.WSSecSAMLToken;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -58,11 +58,6 @@ public class SamlTokenHOKTest {
private WSSecurityEngine secEngine = new WSSecurityEngine();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SamlTokenHOKTest() throws Exception {
WSSConfig config = WSSConfig.getNewInstance();
secEngine.setWssConfig(config);
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java
index 8a2c506..e74c6c8 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java
@@ -27,7 +27,7 @@ import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SAML1CallbackHandler;
import org.apache.wss4j.dom.common.SAML2CallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -42,7 +42,7 @@ import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.message.WSSecHeader;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -66,11 +66,6 @@ public class SamlTokenSVTest {
private CallbackHandler callbackHandler = new KeystoreCallbackHandler();
private Crypto crypto;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SamlTokenSVTest() throws Exception {
WSSConfig.init();
crypto = CryptoFactory.getInstance("crypto.properties");
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
index 90cc62a..3b8ab8b 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
@@ -56,7 +56,7 @@ import org.apache.wss4j.dom.common.SAML1CallbackHandler;
import org.apache.wss4j.dom.common.SAML2CallbackHandler;
import org.apache.wss4j.dom.common.SAMLElementCallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -77,7 +77,7 @@ import org.apache.xml.security.keys.content.RetrievalMethod;
import org.apache.xml.security.keys.content.X509Data;
import org.apache.xml.security.stax.impl.util.IDGenerator;
import org.joda.time.DateTime;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.opensaml.core.xml.XMLObjectBuilder;
import org.opensaml.core.xml.XMLObjectBuilderFactory;
@@ -106,11 +106,6 @@ public class SamlTokenTest {
private WSSecurityEngine secEngine = new WSSecurityEngine();
private static final String IP_ADDRESS = "12.34.56.78"; //NOPMD
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SamlTokenTest() {
WSSConfig config = WSSConfig.getNewInstance();
config.setValidator(WSConstants.SAML_TOKEN, new CustomSamlAssertionValidator());
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java
index 9ffa2ef..ec8ed6e 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java
@@ -26,7 +26,7 @@ import org.apache.wss4j.dom.common.KeystoreCallbackHandler;
import org.apache.wss4j.dom.common.SAML1CallbackHandler;
import org.apache.wss4j.dom.common.SAML2CallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -46,7 +46,7 @@ import org.apache.wss4j.common.util.Loader;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.message.WSSecHeader;
import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -91,11 +91,6 @@ public class SignedSamlTokenHOKTest {
private Crypto issuerCrypto;
private Crypto userCrypto = CryptoFactory.getInstance("wss40.properties");
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public SignedSamlTokenHOKTest() throws Exception {
WSSConfig.init();
// Load the issuer keystore
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java
index c6bfc12..15d4d7e 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java
@@ -35,9 +35,9 @@ import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.common.util.DOM2Writer;
import org.apache.wss4j.common.util.Loader;
import org.apache.wss4j.dom.common.SAML2CallbackHandler;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.opensaml.xmlsec.signature.Signature;
import org.opensaml.xmlsec.signature.support.SignatureConstants;
@@ -69,11 +69,6 @@ public class AssertionSigningTest {
private final String customSignatureDigestAlgorithm = SignatureConstants.ALGO_ID_DIGEST_SHA256;
private final DocumentBuilderFactory dbf;
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public AssertionSigningTest() throws Exception {
WSSConfig.init();
// Load the issuer keystore
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java
index 344326b..e3c69ed 100644
--- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java
@@ -39,7 +39,7 @@ import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.common.SAML1CallbackHandler;
import org.apache.wss4j.dom.common.SOAPUtil;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.common.UsernamePasswordCallbackHandler;
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
@@ -51,7 +51,7 @@ import org.apache.wss4j.dom.message.WSSecSignature;
import org.apache.wss4j.dom.message.WSSecTimestamp;
import org.apache.wss4j.dom.message.WSSecUsernameToken;
import org.apache.wss4j.dom.util.WSSecurityUtil;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
@@ -68,11 +68,6 @@ public class ValidatorTest {
org.slf4j.LoggerFactory.getLogger(ValidatorTest.class);
private WSSecurityEngine secEngine = new WSSecurityEngine();
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
/**
* This is a test for processing an expired Timestamp.
*/
diff --git a/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AbstractPolicyTestBase.java b/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AbstractPolicyTestBase.java
index e369c7e..cfd8349 100644
--- a/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AbstractPolicyTestBase.java
+++ b/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AbstractPolicyTestBase.java
@@ -23,7 +23,7 @@ import org.apache.wss4j.common.crypto.WSProviderConfig;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.saml.SAMLCallback;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.policy.SPConstants;
import org.apache.wss4j.policy.stax.enforcer.PolicyEnforcer;
import org.apache.wss4j.policy.stax.enforcer.PolicyEnforcerFactory;
@@ -37,7 +37,7 @@ import org.apache.xml.security.binding.xmldsig11.NamedCurveType;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.config.Init;
import org.apache.xml.security.stax.impl.util.IDGenerator;
-import org.junit.jupiter.api.AfterAll;
+
import org.junit.jupiter.api.BeforeAll;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -69,11 +69,6 @@ public class AbstractPolicyTestBase extends AbstractTestBase {
Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI(), WSSec.class);
}
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
protected PolicyEnforcer buildAndStartPolicyEngine(String policyString)
throws ParserConfigurationException, SAXException, IOException, WSSPolicyException {
return this.buildAndStartPolicyEngine(policyString, false);
diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java
index 1c56e19..1b601b2 100644
--- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java
+++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java
@@ -54,7 +54,7 @@ import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.XMLUtils;
import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.common.SecurityTestUtil;
+
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.engine.WSSecurityEngine;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
@@ -77,7 +77,7 @@ import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.xml.security.stax.securityEvent.SecurityEventListener;
-import org.junit.jupiter.api.AfterAll;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -102,11 +102,6 @@ public abstract class AbstractTestBase {
WSSConfig.init();
}
- @AfterAll
- public static void cleanup() throws Exception {
- SecurityTestUtil.cleanup();
- }
-
public AbstractTestBase() {
documentBuilderFactory = DocumentBuilderFactory.newInstance();
documentBuilderFactory.setNamespaceAware(true);