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 2019/06/19 10:27:52 UTC
svn commit: r1861612 [1/4] - in /webservices/wss4j/trunk: ./ build-tools/
integration/
integration/src/test/java/org/apache/wss4j/integration/test/kerberos/
parent/ performance/src/test/java/org/apache/wss4j/performance/ policy/
policy/src/test/java/or...
Author: coheigea
Date: Wed Jun 19 10:27:50 2019
New Revision: 1861612
URL: http://svn.apache.org/viewvc?rev=1861612&view=rev
Log:
Switch to Junit 5
Modified:
webservices/wss4j/trunk/build-tools/wss4j-pmd-ruleset.xml
webservices/wss4j/trunk/integration/pom.xml
webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
webservices/wss4j/trunk/parent/pom.xml
webservices/wss4j/trunk/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java
webservices/wss4j/trunk/policy/pom.xml
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/AbstractTestBase.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/AlgorithmSuiteTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/AsymmetricBindingTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/ContentEncryptedElementsTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/EncryptedElementsTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/EncryptedPartsTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/HttpsTokenTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/InitiatorTokenTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/IssuedTokenTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/KerberosTokenTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/KeyValueTokenTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/LayoutTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/PolicyNormalizationTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/RecipientTokenTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/RelTokenTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/RequiredElementsTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/RequiredPartsTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SamlTokenTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SecureConversationTokenTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SecurityContextTokenTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SignedElementsTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SignedPartsTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SpnegoContextTokenTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SupportingTokensTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SymmetricBindingTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/TransportBindingTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/Trust10Test.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/Trust13Test.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/UsernameTokenTest.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/Wss10Test.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/Wss11Test.java
webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/X509TokenTest.java
webservices/wss4j/trunk/pom.xml
webservices/wss4j/trunk/ws-security-common/pom.xml
webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/attachment/AttachmentTest.java
webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/attachment/CRLFOutputStreamTest.java
webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/cache/EHCacheManagerHolderTest.java
webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/cache/ReplayCacheTest.java
webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/AuthorityKeyIdentifierTest.java
webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/NameConstraintsTest.java
webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/PasswordEncryptorTest.java
webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/SKITest.java
webservices/wss4j/trunk/ws-security-dom/pom.xml
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/WSSConfigTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CallbackRefTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomTokenTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/ResultsOrderTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/WSHandlerGetPasswordTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyActionTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionCRLTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SKISignatureTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SecurityContextTokenTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAKITest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureIssuerCertConstraintsTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePrefixListTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureWSS651Test.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SymmetricSignatureTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TestMessageTransformer.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BinarySecurityTokenTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/DerivedKeyTokenTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/ReferenceTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/WCFUsernameTokenTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/SecurityHeaderTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java
webservices/wss4j/trunk/ws-security-policy-stax/pom.xml
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AbstractPolicyTestBase.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingIntegrationTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/ContentEncryptedElementsTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/DerivedKeyTests.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/EncryptedElementsTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/EncryptedPartsTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/HttpsTokenTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/IssuedTokenTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/KerberosTokenTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/KeyValueTokenTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/ProtectionOrderTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RelTokenTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RequiredElementsTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RequiredPartsTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SamlTokenTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecureConversationTokenTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecurityContextTokenTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SignedElementsTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SignedPartsTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SpnegoContextTokenTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SupportingTokensTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SymmetricBindingTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TokenProtectionTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingIntegrationTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/UsernameTokenTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/VulnerabliltyVectorsTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/WSP13SpecTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/X509TokenTest.java
webservices/wss4j/trunk/ws-security-stax/pom.xml
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ConfigurationConverterTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncryptionCRLTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/FaultTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/HeaderOrderingTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/MultipleActionTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/OutputChainTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PasswordEncryptorTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PasswordTypeTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PrincipalTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCertConstaintsTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureConfirmationTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureEncryptionTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureIssuerCertConstaintsTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignaturePrefixListTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/XOPAttachmentTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/CustomContentsTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenHOKTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenNegativeTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenSVTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlTokenDerivedTest.java
Modified: webservices/wss4j/trunk/build-tools/wss4j-pmd-ruleset.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/build-tools/wss4j-pmd-ruleset.xml?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/build-tools/wss4j-pmd-ruleset.xml (original)
+++ webservices/wss4j/trunk/build-tools/wss4j-pmd-ruleset.xml Wed Jun 19 10:27:50 2019
@@ -36,6 +36,8 @@
<rule ref="rulesets/java/empty.xml"/>
<rule ref="rulesets/java/migrating.xml">
<exclude name="JUnit4TestShouldUseAfterAnnotation" />
+ <exclude name="JUnit4TestShouldUseAfterAnnotation" />
+ <exclude name="JUnit4TestShouldUseTestAnnotation" />
<exclude name="JUnit4TestShouldUseBeforeAnnotation" />
</rule>
<rule ref="rulesets/java/unnecessary.xml"/>
Modified: webservices/wss4j/trunk/integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/integration/pom.xml?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/integration/pom.xml (original)
+++ webservices/wss4j/trunk/integration/pom.xml Wed Jun 19 10:27:50 2019
@@ -78,8 +78,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java (original)
+++ webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java Wed Jun 19 10:27:50 2019
@@ -73,16 +73,16 @@ import org.apache.wss4j.stax.test.utils.
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.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class KerberosTest {
@@ -97,7 +97,7 @@ public class KerberosTest {
private static SimpleKdcServer kerbyServer;
- @BeforeClass
+ @BeforeAll
public static void setUp() throws Exception {
WSSConfig.init();
@@ -144,7 +144,7 @@ public class KerberosTest {
xmlInputFactory.setProperty(XMLInputFactory.SUPPORT_DTD, false);
}
- @AfterClass
+ @AfterAll
public static void tearDown() throws Exception {
SecurityTestUtil.cleanup();
if (kerbyServer != null) {
Modified: webservices/wss4j/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/parent/pom.xml?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/parent/pom.xml (original)
+++ webservices/wss4j/trunk/parent/pom.xml Wed Jun 19 10:27:50 2019
@@ -36,8 +36,9 @@
<commons.compress.version>1.18</commons.compress.version>
<ehcache.version>2.10.6</ehcache.version>
<geronimo.javamail.version>1.8.4</geronimo.javamail.version>
+ <hamcrest.version>2.1</hamcrest.version>
<jasypt.version>1.9.2</jasypt.version>
- <junit.version>4.12</junit.version>
+ <junit.version>5.4.2</junit.version>
<kerby.version>2.0.0</kerby.version>
<neethi.version>3.1.1</neethi.version>
<opensaml.version>3.3.0</opensaml.version>
@@ -46,7 +47,7 @@
<xalan.version>2.7.2</xalan.version>
<xz.version>1.8</xz.version>
<xmlsec.version>2.2.0-SNAPSHOT</xmlsec.version>
- <xmlunit.version>1.6</xmlunit.version>
+ <xmlunit.version>2.6.2</xmlunit.version>
<!-- OSGi related properties -->
<wss4j.osgi.import />
@@ -104,8 +105,8 @@
<version>${xalan.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
</dependency>
<dependency>
@@ -114,8 +115,13 @@
<version>${wsdl4j.version}</version>
</dependency>
<dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-core</artifactId>
+ <version>${xmlunit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-matchers</artifactId>
<version>${xmlunit.version}</version>
</dependency>
<dependency>
@@ -138,7 +144,11 @@
<artifactId>xz</artifactId>
<version>${xz.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <version>${hamcrest.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: webservices/wss4j/trunk/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java (original)
+++ webservices/wss4j/trunk/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java Wed Jun 19 10:27:50 2019
@@ -80,9 +80,9 @@ import java.util.logging.Level;
import java.util.logging.LogManager;
import java.util.logging.Logger;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
public abstract class AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/pom.xml?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/pom.xml (original)
+++ webservices/wss4j/trunk/policy/pom.xml Wed Jun 19 10:27:50 2019
@@ -40,13 +40,18 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-matchers</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/AbstractTestBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/AbstractTestBase.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/AbstractTestBase.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/AbstractTestBase.java Wed Jun 19 10:27:50 2019
@@ -23,7 +23,6 @@ import java.io.ByteArrayInputStream;
import java.io.InputStreamReader;
import java.io.StringWriter;
import java.nio.charset.StandardCharsets;
-import java.util.List;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamWriter;
@@ -70,11 +69,8 @@ import org.apache.wss4j.policy.builders.
import org.apache.wss4j.policy.builders.WSS10Builder;
import org.apache.wss4j.policy.builders.WSS11Builder;
import org.apache.wss4j.policy.builders.X509TokenBuilder;
-import org.custommonkey.xmlunit.DetailedDiff;
-import org.custommonkey.xmlunit.Diff;
-import org.custommonkey.xmlunit.XMLUnit;
-
-import static org.junit.Assert.assertEquals;
+import org.hamcrest.MatcherAssert;
+import org.xmlunit.matchers.CompareMatcher;
public abstract class AbstractTestBase {
protected XMLOutputFactory xmlOutputFactory = XMLOutputFactory.newInstance();
@@ -89,11 +85,7 @@ public abstract class AbstractTestBase {
}
protected void assertXMLisEqual(String actual, String expected) throws Exception {
- XMLUnit.setIgnoreWhitespace(true);
- final Diff diff = new Diff(expected, actual);
- DetailedDiff myDiff = new DetailedDiff(diff);
- List<?> allDifferences = myDiff.getAllDifferences();
- assertEquals(myDiff.toString(), 0, allDifferences.size());
+ MatcherAssert.assertThat(actual, CompareMatcher.isIdenticalTo(expected).ignoreWhitespace());
}
protected String loadPolicyFile(String classpathResource) throws Exception {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/AlgorithmSuiteTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/AlgorithmSuiteTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/AlgorithmSuiteTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/AlgorithmSuiteTest.java Wed Jun 19 10:27:50 2019
@@ -22,14 +22,14 @@ import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.SPConstants;
import org.apache.wss4j.policy.model.AlgorithmSuite;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class AlgorithmSuiteTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/AsymmetricBindingTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/AsymmetricBindingTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/AsymmetricBindingTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/AsymmetricBindingTest.java Wed Jun 19 10:27:50 2019
@@ -22,16 +22,16 @@ import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.AbstractSymmetricAsymmetricBinding;
import org.apache.wss4j.policy.model.AsymmetricBinding;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class AsymmetricBindingTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/ContentEncryptedElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/ContentEncryptedElementsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/ContentEncryptedElementsTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/ContentEncryptedElementsTest.java Wed Jun 19 10:27:50 2019
@@ -21,14 +21,14 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.ContentEncryptedElements;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ContentEncryptedElementsTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/EncryptedElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/EncryptedElementsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/EncryptedElementsTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/EncryptedElementsTest.java Wed Jun 19 10:27:50 2019
@@ -21,14 +21,14 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.EncryptedElements;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class EncryptedElementsTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/EncryptedPartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/EncryptedPartsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/EncryptedPartsTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/EncryptedPartsTest.java Wed Jun 19 10:27:50 2019
@@ -21,15 +21,15 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.EncryptedParts;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class EncryptedPartsTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/HttpsTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/HttpsTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/HttpsTokenTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/HttpsTokenTest.java Wed Jun 19 10:27:50 2019
@@ -21,14 +21,14 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.HttpsToken;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class HttpsTokenTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/InitiatorTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/InitiatorTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/InitiatorTokenTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/InitiatorTokenTest.java Wed Jun 19 10:27:50 2019
@@ -21,15 +21,15 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.InitiatorToken;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class InitiatorTokenTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/IssuedTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/IssuedTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/IssuedTokenTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/IssuedTokenTest.java Wed Jun 19 10:27:50 2019
@@ -21,15 +21,15 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.IssuedToken;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class IssuedTokenTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/KerberosTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/KerberosTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/KerberosTokenTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/KerberosTokenTest.java Wed Jun 19 10:27:50 2019
@@ -21,14 +21,14 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.KerberosToken;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class KerberosTokenTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/KeyValueTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/KeyValueTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/KeyValueTokenTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/KeyValueTokenTest.java Wed Jun 19 10:27:50 2019
@@ -21,14 +21,14 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.KeyValueToken;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class KeyValueTokenTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/LayoutTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/LayoutTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/LayoutTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/LayoutTest.java Wed Jun 19 10:27:50 2019
@@ -21,14 +21,14 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.Layout;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class LayoutTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/PolicyNormalizationTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/PolicyNormalizationTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/PolicyNormalizationTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/PolicyNormalizationTest.java Wed Jun 19 10:27:50 2019
@@ -20,12 +20,12 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class PolicyNormalizationTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/RecipientTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/RecipientTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/RecipientTokenTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/RecipientTokenTest.java Wed Jun 19 10:27:50 2019
@@ -21,15 +21,15 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.RecipientToken;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class RecipientTokenTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/RelTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/RelTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/RelTokenTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/RelTokenTest.java Wed Jun 19 10:27:50 2019
@@ -21,14 +21,14 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.RelToken;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class RelTokenTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/RequiredElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/RequiredElementsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/RequiredElementsTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/RequiredElementsTest.java Wed Jun 19 10:27:50 2019
@@ -21,14 +21,14 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.RequiredElements;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class RequiredElementsTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/RequiredPartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/RequiredPartsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/RequiredPartsTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/RequiredPartsTest.java Wed Jun 19 10:27:50 2019
@@ -21,14 +21,14 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.RequiredParts;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class RequiredPartsTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SamlTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SamlTokenTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SamlTokenTest.java Wed Jun 19 10:27:50 2019
@@ -21,15 +21,15 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.SamlToken;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SamlTokenTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SecureConversationTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SecureConversationTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SecureConversationTokenTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SecureConversationTokenTest.java Wed Jun 19 10:27:50 2019
@@ -21,15 +21,15 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.SecureConversationToken;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SecureConversationTokenTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SecurityContextTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SecurityContextTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SecurityContextTokenTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SecurityContextTokenTest.java Wed Jun 19 10:27:50 2019
@@ -21,14 +21,14 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.SecurityContextToken;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SecurityContextTokenTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SignedElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SignedElementsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SignedElementsTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SignedElementsTest.java Wed Jun 19 10:27:50 2019
@@ -21,14 +21,14 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.SignedElements;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SignedElementsTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SignedPartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SignedPartsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SignedPartsTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SignedPartsTest.java Wed Jun 19 10:27:50 2019
@@ -21,15 +21,15 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.SignedParts;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SignedPartsTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SpnegoContextTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SpnegoContextTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SpnegoContextTokenTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SpnegoContextTokenTest.java Wed Jun 19 10:27:50 2019
@@ -21,14 +21,14 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.SpnegoContextToken;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SpnegoContextTokenTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SupportingTokensTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SupportingTokensTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SupportingTokensTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SupportingTokensTest.java Wed Jun 19 10:27:50 2019
@@ -21,15 +21,15 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.SupportingTokens;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SupportingTokensTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SymmetricBindingTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SymmetricBindingTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SymmetricBindingTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/SymmetricBindingTest.java Wed Jun 19 10:27:50 2019
@@ -22,15 +22,15 @@ import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.AbstractSymmetricAsymmetricBinding;
import org.apache.wss4j.policy.model.SymmetricBinding;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SymmetricBindingTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/TransportBindingTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/TransportBindingTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/TransportBindingTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/TransportBindingTest.java Wed Jun 19 10:27:50 2019
@@ -21,15 +21,15 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.TransportBinding;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class TransportBindingTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/Trust10Test.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/Trust10Test.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/Trust10Test.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/Trust10Test.java Wed Jun 19 10:27:50 2019
@@ -21,14 +21,14 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP11Constants;
import org.apache.wss4j.policy.model.Trust10;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class Trust10Test extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/Trust13Test.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/Trust13Test.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/Trust13Test.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/Trust13Test.java Wed Jun 19 10:27:50 2019
@@ -22,14 +22,14 @@ import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.SP13Constants;
import org.apache.wss4j.policy.model.Trust13;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class Trust13Test extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/UsernameTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/UsernameTokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/UsernameTokenTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/UsernameTokenTest.java Wed Jun 19 10:27:50 2019
@@ -21,15 +21,15 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.UsernameToken;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class UsernameTokenTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/Wss10Test.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/Wss10Test.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/Wss10Test.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/Wss10Test.java Wed Jun 19 10:27:50 2019
@@ -21,14 +21,14 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.Wss10;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class Wss10Test extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/Wss11Test.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/Wss11Test.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/Wss11Test.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/Wss11Test.java Wed Jun 19 10:27:50 2019
@@ -21,14 +21,14 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.Wss11;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class Wss11Test extends AbstractTestBase {
Modified: webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/X509TokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/X509TokenTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/X509TokenTest.java (original)
+++ webservices/wss4j/trunk/policy/src/test/java/org/apache/wss4j/policy/tests/X509TokenTest.java Wed Jun 19 10:27:50 2019
@@ -21,14 +21,14 @@ package org.apache.wss4j.policy.tests;
import org.apache.neethi.*;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.model.X509Token;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Iterator;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class X509TokenTest extends AbstractTestBase {
Modified: webservices/wss4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/pom.xml?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/pom.xml (original)
+++ webservices/wss4j/trunk/pom.xml Wed Jun 19 10:27:50 2019
@@ -395,7 +395,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.21.0</version>
+ <version>2.22.1</version>
<configuration>
<reportFormat>brief</reportFormat>
<useFile>false</useFile>
@@ -424,7 +424,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.21.0</version>
+ <version>2.22.1</version>
<configuration>
<reportFormat>brief</reportFormat>
<useFile>false</useFile>
@@ -486,7 +486,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.21.0</version>
+ <version>2.22.1</version>
<inherited>true</inherited>
<configuration>
<reportFormat>brief</reportFormat>
Modified: webservices/wss4j/trunk/ws-security-common/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/pom.xml?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-common/pom.xml Wed Jun 19 10:27:50 2019
@@ -214,8 +214,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -223,6 +223,11 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/attachment/AttachmentTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/attachment/AttachmentTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/attachment/AttachmentTest.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/attachment/AttachmentTest.java Wed Jun 19 10:27:50 2019
@@ -18,11 +18,11 @@
*/
package org.apache.wss4j.common.attachment;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.apache.wss4j.common.util.AttachmentUtils;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class AttachmentTest {
Modified: webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/attachment/CRLFOutputStreamTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/attachment/CRLFOutputStreamTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/attachment/CRLFOutputStreamTest.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/attachment/CRLFOutputStreamTest.java Wed Jun 19 10:27:50 2019
@@ -19,12 +19,12 @@
package org.apache.wss4j.common.attachment;
import org.apache.wss4j.common.util.CRLFOutputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.ByteArrayOutputStream;
import java.util.Random;
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
public class CRLFOutputStreamTest {
Modified: webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/cache/EHCacheManagerHolderTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/cache/EHCacheManagerHolderTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/cache/EHCacheManagerHolderTest.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/cache/EHCacheManagerHolderTest.java Wed Jun 19 10:27:50 2019
@@ -25,10 +25,10 @@ import net.sf.ehcache.config.CacheConfig
import net.sf.ehcache.config.Configuration;
import net.sf.ehcache.config.ConfigurationFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
*
Modified: webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/cache/ReplayCacheTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/cache/ReplayCacheTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/cache/ReplayCacheTest.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/cache/ReplayCacheTest.java Wed Jun 19 10:27:50 2019
@@ -24,10 +24,10 @@ import java.net.URL;
import java.time.Instant;
import java.util.UUID;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Some unit tests for the ReplayCache implementations
Modified: webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/AuthorityKeyIdentifierTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/AuthorityKeyIdentifierTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/AuthorityKeyIdentifierTest.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/AuthorityKeyIdentifierTest.java Wed Jun 19 10:27:50 2019
@@ -26,11 +26,11 @@ import java.util.Arrays;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.Loader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* This is a test for extracting AuthorityKeyIdentifier/SubjectKeyIdentifier information from
Modified: webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/NameConstraintsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/NameConstraintsTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/NameConstraintsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/NameConstraintsTest.java Wed Jun 19 10:27:50 2019
@@ -39,11 +39,12 @@ import java.util.regex.Pattern;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.Loader;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
* Tests the handling of {@code NameConstraint}s with {@code TrustAnchor}s in the
@@ -74,7 +75,7 @@ public class NameConstraintsTest {
private static final Pattern SUBJ_PATTERN = Pattern.compile(".*OU=wss4j,O=apache");
- @Before
+ @BeforeEach
public void setup() throws Exception {
WSProviderConfig.init();
}
@@ -240,7 +241,7 @@ public class NameConstraintsTest {
getMerlinAkiBc());
}
- @Test(expected = Exception.class)
+ @Test
public void testNameConstraintsWithKeyStoreUsingMerlinBreaking() throws Exception {
Properties properties = new Properties();
properties.setProperty("org.apache.wss4j.crypto.merlin.cert.provider.nameconstraints",
@@ -251,10 +252,12 @@ public class NameConstraintsTest {
.getClassLoader(),
null);
- withKeyStoreUsingMerlin(getRootKeyStore(), getTestCertificateChain(ROOT_SIGNED), merlin);
+ Assertions.assertThrows(Exception.class, () -> {
+ withKeyStoreUsingMerlin(getRootKeyStore(), getTestCertificateChain(ROOT_SIGNED), merlin);
+ });
}
- @Test(expected = Exception.class)
+ @Test
public void testNameConstraintsWithKeyStoreUsingMerlinAkiBreaking() throws Exception {
Properties properties = new Properties();
properties.setProperty("org.apache.wss4j.crypto.merlin.cert.provider.nameconstraints",
@@ -265,7 +268,9 @@ public class NameConstraintsTest {
.getClassLoader(),
null);
- withKeyStoreUsingMerlin(getRootKeyStore(), getTestCertificateChain(ROOT_SIGNED), merlin);
+ Assertions.assertThrows(Exception.class, () -> {
+ withKeyStoreUsingMerlin(getRootKeyStore(), getTestCertificateChain(ROOT_SIGNED), merlin);
+ });
}
@Test
Modified: webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/PasswordEncryptorTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/PasswordEncryptorTest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/PasswordEncryptorTest.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/PasswordEncryptorTest.java Wed Jun 19 10:27:50 2019
@@ -19,10 +19,10 @@
package org.apache.wss4j.common.crypto;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
/**
* This is a test for the PasswordEncryptor interface
Modified: webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/SKITest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/SKITest.java?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/SKITest.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/SKITest.java Wed Jun 19 10:27:50 2019
@@ -26,10 +26,10 @@ import java.security.cert.X509Certificat
import org.apache.wss4j.common.util.Loader;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* This is a test for WSS-300 - "SubjectKeyIdentifier (SKI) incorrectly calculated for 2048-bit RSA key".
Modified: webservices/wss4j/trunk/ws-security-dom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/pom.xml?rev=1861612&r1=1861611&r2=1861612&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-dom/pom.xml Wed Jun 19 10:27:50 2019
@@ -102,8 +102,8 @@
<classifier>tests</classifier>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>