ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1850227 [1/11] - in /webservices/wss4j/trunk: build-tools/ integration/src/test/java/org/apache/wss4j/integration/test/kerberos/ performance/src/test/java/org/apache/wss4j/performance/ policy/src/test/java/org/apache/wss4j/policy/tests/ ws...
Date Thu, 03 Jan 2019 11:48:58 GMT
Author: coheigea
Date: Thu Jan  3 11:48:56 2019
New Revision: 1850227

URL: http://svn.apache.org/viewvc?rev=1850227&view=rev
Log:
Switch not to extend Junit Assert

Modified:
    webservices/wss4j/trunk/build-tools/wss4j-pmd-ruleset.xml
    webservices/wss4j/trunk/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
    webservices/wss4j/trunk/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java
    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/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/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/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/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/LayoutTest.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/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/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/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=1850227&r1=1850226&r2=1850227&view=diff
==============================================================================
--- webservices/wss4j/trunk/build-tools/wss4j-pmd-ruleset.xml (original)
+++ webservices/wss4j/trunk/build-tools/wss4j-pmd-ruleset.xml Thu Jan  3 11:48:56 2019
@@ -27,6 +27,11 @@
   <rule ref="rulesets/java/basic.xml"/>
   <rule ref="rulesets/java/unusedcode.xml"/>
   <rule ref="rulesets/java/imports.xml"/>
+  <rule ref="rulesets/java/imports.xml/TooManyStaticImports">
+      <properties>
+          <property name="maximumStaticImports" value="6"/>
+      </properties>
+  </rule>
   <rule ref="rulesets/java/braces.xml"/>
   <rule ref="rulesets/java/empty.xml"/>
   <rule ref="rulesets/java/migrating.xml">

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -74,12 +74,16 @@ import org.apache.xml.security.exception
 import org.apache.xml.security.stax.securityEvent.SecurityEvent;
 import org.apache.xml.security.stax.securityEvent.SecurityEventListener;
 import org.junit.AfterClass;
-import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.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;
+
 public class KerberosTest {
 
     private static final org.slf4j.Logger LOG =
@@ -204,11 +208,11 @@ public class KerberosTest {
             results.getActionResults().get(WSConstants.BST).get(0);
         BinarySecurity token =
             (BinarySecurity)actionResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
-        Assert.assertNotNull(token);
+        assertNotNull(token);
 
         Principal principal = (Principal)actionResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
-        Assert.assertTrue(principal instanceof KerberosPrincipal);
-        Assert.assertTrue(principal.getName().contains("alice"));
+        assertTrue(principal instanceof KerberosPrincipal);
+        assertTrue(principal.getName().contains("alice"));
     }
 
     /**
@@ -241,11 +245,11 @@ public class KerberosTest {
         spnegoToken.retrieveServiceTicket("alice", callbackHandler, "bob@service.ws.apache.org");
 
         byte[] token = spnegoToken.getToken();
-        Assert.assertNotNull(token);
+        assertNotNull(token);
 
         spnegoToken = new SpnegoTokenContext();
         spnegoToken.validateServiceTicket("bob", callbackHandler, "bob@service.ws.apache.org", token);
-        Assert.assertTrue(spnegoToken.isEstablished());
+        assertTrue(spnegoToken.isEstablished());
     }
 
     /**
@@ -275,18 +279,18 @@ public class KerberosTest {
         try {
             KerberosSecurity bst = new KerberosSecurity(doc);
             bst.retrieveServiceTicket("alice2", callbackHandler, "bob@service");
-            Assert.fail("Failure expected on an unknown user");
+            fail("Failure expected on an unknown user");
         } catch (WSSecurityException ex) {
-            Assert.assertTrue(ex.getMessage().startsWith("An error occurred in trying to obtain a TGT:"));
+            assertTrue(ex.getMessage().startsWith("An error occurred in trying to obtain a TGT:"));
         }
 
 
         try {
             KerberosSecurity bst = new KerberosSecurity(doc);
             bst.retrieveServiceTicket("alice", callbackHandler, "bob2@service");
-            Assert.fail("Failure expected on an unknown user");
+            fail("Failure expected on an unknown user");
         } catch (WSSecurityException ex) {
-            Assert.assertEquals(ex.getMessage(), "An error occurred in trying to obtain a service ticket");
+            assertEquals(ex.getMessage(), "An error occurred in trying to obtain a service ticket");
         }
 
     }
@@ -357,11 +361,11 @@ public class KerberosTest {
             results.getActionResults().get(WSConstants.BST).get(0);
         BinarySecurity token =
             (BinarySecurity)actionResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
-        Assert.assertNotNull(token);
+        assertNotNull(token);
 
         Principal principal = (Principal)actionResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
-        Assert.assertTrue(principal instanceof KerberosPrincipal);
-        Assert.assertTrue(principal.getName().contains("alice"));
+        assertTrue(principal instanceof KerberosPrincipal);
+        assertTrue(principal.getName().contains("alice"));
     }
 
 
@@ -435,11 +439,11 @@ public class KerberosTest {
             results.getActionResults().get(WSConstants.BST).get(0);
         BinarySecurity token =
             (BinarySecurity)actionResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
-        Assert.assertNotNull(token);
+        assertNotNull(token);
 
         Principal principal = (Principal)actionResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
-        Assert.assertTrue(principal instanceof KerberosPrincipal);
-        Assert.assertTrue(principal.getName().contains("alice"));
+        assertTrue(principal instanceof KerberosPrincipal);
+        assertTrue(principal.getName().contains("alice"));
     }
 
     /**
@@ -508,11 +512,11 @@ public class KerberosTest {
             results.getActionResults().get(WSConstants.BST).get(0);
         BinarySecurity token =
             (BinarySecurity)actionResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
-        Assert.assertNotNull(token);
+        assertNotNull(token);
 
         Principal principal = (Principal)actionResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
-        Assert.assertTrue(principal instanceof KerberosPrincipal);
-        Assert.assertTrue(principal.getName().contains("alice"));
+        assertTrue(principal instanceof KerberosPrincipal);
+        assertTrue(principal.getName().contains("alice"));
         } catch (Throwable t) {
             t.printStackTrace();
         }
@@ -584,11 +588,11 @@ public class KerberosTest {
             results.getActionResults().get(WSConstants.BST).get(0);
         BinarySecurity token =
             (BinarySecurity)actionResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
-        Assert.assertNotNull(token);
+        assertNotNull(token);
 
         Principal principal = (Principal)actionResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
-        Assert.assertTrue(principal instanceof KerberosPrincipal);
-        Assert.assertTrue(principal.getName().contains("alice"));
+        assertTrue(principal instanceof KerberosPrincipal);
+        assertTrue(principal.getName().contains("alice"));
     }
 
     /**
@@ -659,11 +663,11 @@ public class KerberosTest {
             results.getActionResults().get(WSConstants.BST).get(0);
         BinarySecurity token =
             (BinarySecurity)actionResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
-        Assert.assertNotNull(token);
+        assertNotNull(token);
 
         Principal principal = (Principal)actionResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
-        Assert.assertTrue(principal instanceof KerberosPrincipal);
-        Assert.assertTrue(principal.getName().contains("alice"));
+        assertTrue(principal instanceof KerberosPrincipal);
+        assertTrue(principal.getName().contains("alice"));
     }
 
     //
@@ -709,7 +713,7 @@ public class KerberosTest {
 
             document = dbf.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray()));
             NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
-            Assert.assertEquals(nodeList.getLength(), 1);
+            assertEquals(nodeList.getLength(), 1);
         }
 
         //done signature; now test sig-verification:
@@ -741,11 +745,11 @@ public class KerberosTest {
                     results.getActionResults().get(WSConstants.BST).get(0);
             BinarySecurity token =
                     (BinarySecurity) actionResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
-            Assert.assertNotNull(token);
+            assertNotNull(token);
 
             Principal principal = (Principal) actionResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
-            Assert.assertTrue(principal instanceof KerberosPrincipal);
-            Assert.assertTrue(principal.getName().contains("alice"));
+            assertTrue(principal instanceof KerberosPrincipal);
+            assertTrue(principal.getName().contains("alice"));
         }
     }
 
@@ -831,14 +835,14 @@ public class KerberosTest {
 
             //header element must still be there
             NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
-            Assert.assertEquals(nodeList.getLength(), 1);
-            Assert.assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_WSSE_SECURITY.getLocalPart());
+            assertEquals(nodeList.getLength(), 1);
+            assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_WSSE_SECURITY.getLocalPart());
 
-            Assert.assertEquals(kerberosTokenSecurityEvents.size(), 1);
+            assertEquals(kerberosTokenSecurityEvents.size(), 1);
             final KerberosTokenSecurityEvent kerberosTokenSecurityEvent = kerberosTokenSecurityEvents.get(0);
-            Assert.assertNotNull(kerberosTokenSecurityEvent.getSecurityToken().getSubject());
-            Assert.assertTrue(kerberosTokenSecurityEvent.getSecurityToken().getPrincipal() instanceof KerberosPrincipal);
-            Assert.assertEquals(kerberosTokenSecurityEvent.getSecurityToken().getPrincipal().getName(), "alice@service.ws.apache.org");
+            assertNotNull(kerberosTokenSecurityEvent.getSecurityToken().getSubject());
+            assertTrue(kerberosTokenSecurityEvent.getSecurityToken().getPrincipal() instanceof KerberosPrincipal);
+            assertEquals(kerberosTokenSecurityEvent.getSecurityToken().getPrincipal().getName(), "alice@service.ws.apache.org");
         }
     }
 
@@ -928,10 +932,10 @@ public class KerberosTest {
 
             //header element must still be there
             NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_dsig_Signature.getNamespaceURI(), WSSConstants.TAG_dsig_Signature.getLocalPart());
-            Assert.assertEquals(nodeList.getLength(), 1);
-            Assert.assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_WSSE_SECURITY.getLocalPart());
+            assertEquals(nodeList.getLength(), 1);
+            assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_WSSE_SECURITY.getLocalPart());
 
-            Assert.assertEquals(kerberosTokenSecurityEvents.size(), 1);
+            assertEquals(kerberosTokenSecurityEvents.size(), 1);
         }
     }
 
@@ -976,7 +980,7 @@ public class KerberosTest {
 
             document = dbf.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray()));
             NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_xenc_ReferenceList.getNamespaceURI(), WSSConstants.TAG_xenc_ReferenceList.getLocalPart());
-            Assert.assertEquals(1, nodeList.getLength());
+            assertEquals(1, nodeList.getLength());
         }
 
         {
@@ -1007,11 +1011,11 @@ public class KerberosTest {
                     results.getActionResults().get(WSConstants.BST).get(0);
             BinarySecurity token =
                     (BinarySecurity) actionResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
-            Assert.assertNotNull(token);
+            assertNotNull(token);
 
             Principal principal = (Principal) actionResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
-            Assert.assertTrue(principal instanceof KerberosPrincipal);
-            Assert.assertTrue(principal.getName().contains("alice"));
+            assertTrue(principal instanceof KerberosPrincipal);
+            assertTrue(principal.getName().contains("alice"));
         }
     }
 
@@ -1095,14 +1099,14 @@ public class KerberosTest {
 
             //header element must still be there
             NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_WSSE_BINARY_SECURITY_TOKEN.getNamespaceURI(), WSSConstants.TAG_WSSE_BINARY_SECURITY_TOKEN.getLocalPart());
-            Assert.assertEquals(nodeList.getLength(), 1);
-            Assert.assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_WSSE_SECURITY.getLocalPart());
+            assertEquals(nodeList.getLength(), 1);
+            assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_WSSE_SECURITY.getLocalPart());
 
             //no encrypted content
             nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedData.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedData.getLocalPart());
-            Assert.assertEquals(nodeList.getLength(), 0);
+            assertEquals(nodeList.getLength(), 0);
 
-            Assert.assertEquals(kerberosTokenSecurityEvents.size(), 1);
+            assertEquals(kerberosTokenSecurityEvents.size(), 1);
         }
     }
 
@@ -1191,15 +1195,15 @@ public class KerberosTest {
 
             //header element must still be there
             NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_WSSE_BINARY_SECURITY_TOKEN.getNamespaceURI(), WSSConstants.TAG_WSSE_BINARY_SECURITY_TOKEN.getLocalPart());
-            Assert.assertEquals(nodeList.getLength(), 1);
-            Assert.assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_WSSE_SECURITY.getLocalPart());
+            assertEquals(nodeList.getLength(), 1);
+            assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_WSSE_SECURITY.getLocalPart());
 
             //no encrypted content
             nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedData.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedData.getLocalPart());
-            Assert.assertEquals(nodeList.getLength(), 0);
+            assertEquals(nodeList.getLength(), 0);
 
-            Assert.assertEquals(kerberosTokenSecurityEvents.size(), 1);
+            assertEquals(kerberosTokenSecurityEvents.size(), 1);
         }
     }
 
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -53,7 +53,6 @@ import org.apache.xml.security.stax.secu
 import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
 import org.apache.xml.security.stax.securityEvent.SecurityEventListener;
 import org.junit.AfterClass;
-import org.junit.Assert;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -81,7 +80,11 @@ import java.util.logging.Level;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
 
-public abstract class AbstractTestBase extends org.junit.Assert {
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+public abstract class AbstractTestBase {
 
     //javax.xml.transform.Transformer transformer = TransformerFactory.newInstance().newTransformer();
     //transformer.transform(new StreamSource(new ByteArrayInputStream(baos.toByteArray())), new StreamResult(System.out));
@@ -643,15 +646,15 @@ public abstract class AbstractTestBase e
 
         @Override
         public void registerSecurityEvent(SecurityEvent securityEvent) throws WSSecurityException {
-            Assert.assertNotNull(securityEvent.getCorrelationID());
-            Assert.assertNotEquals("", securityEvent.getCorrelationID());
+            assertNotNull(securityEvent.getCorrelationID());
+            assertNotEquals("", securityEvent.getCorrelationID());
             receivedSecurityEvents.add(securityEvent);
         }
 
         public void compare() {
             if (expectedEvents.length != receivedSecurityEvents.size()) {
                 printEvents();
-                Assert.fail("event count mismatch");
+                fail("event count mismatch");
             }
             boolean asserted = true;
             for (int i = 0; i < expectedEvents.length; i++) {
@@ -662,7 +665,7 @@ public abstract class AbstractTestBase e
             }
             if (!asserted) {
                 printEvents();
-                Assert.fail("event mismatch");
+                fail("event mismatch");
             }
         }
 
@@ -780,4 +783,4 @@ public abstract class AbstractTestBase e
         }
         return 0.0d;
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -74,7 +74,9 @@ import org.custommonkey.xmlunit.Detailed
 import org.custommonkey.xmlunit.Diff;
 import org.custommonkey.xmlunit.XMLUnit;
 
-public abstract class AbstractTestBase extends org.junit.Assert {
+import static org.junit.Assert.assertEquals;
+
+public abstract class AbstractTestBase {
     protected XMLOutputFactory xmlOutputFactory = XMLOutputFactory.newInstance();
 
     protected String serializePolicy(Policy policy) throws Exception {
@@ -159,4 +161,4 @@ public abstract class AbstractTestBase e
     protected Policy loadPolicy(String policy, PolicyBuilder policyBuilder) throws Exception {
         return policyBuilder.getPolicy(new ByteArrayInputStream(policy.getBytes(StandardCharsets.UTF_8)));
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -27,6 +27,10 @@ import org.junit.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;
+
 public class AlgorithmSuiteTest extends AbstractTestBase {
 
     @Test
@@ -94,4 +98,4 @@ public class AlgorithmSuiteTest extends
         assertEquals(AlgorithmSuite.STRType.STRTransform10, algorithmSuite.getStrType());
         assertEquals(AlgorithmSuite.XPathType.AbsXPath, algorithmSuite.getXPathType());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -27,6 +27,12 @@ import org.junit.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;
+
 public class AsymmetricBindingTest extends AbstractTestBase {
 
     @Test
@@ -110,4 +116,4 @@ public class AsymmetricBindingTest exten
         assertTrue(asymmetricBinding.isOnlySignEntireHeadersAndBody());
         assertTrue(asymmetricBinding.isProtectTokens());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,10 @@ import org.junit.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;
+
 public class ContentEncryptedElementsTest extends AbstractTestBase {
 
     @Test
@@ -87,4 +91,4 @@ public class ContentEncryptedElementsTes
         assertEquals("1.1", contentEncryptedElements.getXPathVersion());
         assertEquals(2, contentEncryptedElements.getXPaths().size());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,10 @@ import org.junit.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;
+
 public class EncryptedElementsTest extends AbstractTestBase {
 
     @Test
@@ -87,4 +91,4 @@ public class EncryptedElementsTest exten
         assertEquals("1.1", encryptedElements.getXPathVersion());
         assertEquals(2, encryptedElements.getXPaths().size());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,11 @@ import org.junit.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;
+
 public class EncryptedPartsTest extends AbstractTestBase {
 
     @Test
@@ -155,4 +160,4 @@ public class EncryptedPartsTest extends
         assertTrue(encryptedParts.getAttachments().isAttachmentCompleteSignatureTransform());
         assertEquals(2, encryptedParts.getHeaders().size());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,10 @@ import org.junit.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;
+
 public class HttpsTokenTest extends AbstractTestBase {
 
     @Test
@@ -85,4 +89,4 @@ public class HttpsTokenTest extends Abst
         assertEquals(SP12Constants.HTTPS_TOKEN, httpsToken.getName());
         assertEquals(HttpsToken.AuthenticationType.RequireClientCertificate, httpsToken.getAuthenticationType());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,11 @@ import org.junit.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;
+
 public class InitiatorTokenTest extends AbstractTestBase {
 
     @Test
@@ -87,4 +92,4 @@ public class InitiatorTokenTest extends
         assertNotNull(initiatorToken.getToken());
         assertEquals(SP12Constants.X509_TOKEN, initiatorToken.getToken().getName());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,11 @@ import org.junit.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;
+
 public class IssuedTokenTest extends AbstractTestBase {
 
     @Test
@@ -89,4 +94,4 @@ public class IssuedTokenTest extends Abs
         assertTrue(issuedToken.isRequireExternalReference());
         assertTrue(issuedToken.isRequireInternalReference());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,10 @@ import org.junit.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;
+
 public class KerberosTokenTest extends AbstractTestBase {
 
     @Test
@@ -85,4 +89,4 @@ public class KerberosTokenTest extends A
         assertEquals(SP12Constants.KERBEROS_TOKEN, kerberosToken.getName());
         assertEquals(KerberosToken.ApReqTokenType.WssKerberosV5ApReqToken11, kerberosToken.getApReqTokenType());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,10 @@ import org.junit.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;
+
 public class KeyValueTokenTest extends AbstractTestBase {
 
     @Test
@@ -85,4 +89,4 @@ public class KeyValueTokenTest extends A
         assertEquals(SP12Constants.KEY_VALUE_TOKEN, keyValueToken.getName());
         assertTrue(keyValueToken.isRsaKeyValue());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,10 @@ import org.junit.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;
+
 public class LayoutTest extends AbstractTestBase {
 
     @Test
@@ -83,4 +87,4 @@ public class LayoutTest extends Abstract
         assertEquals(Constants.TYPE_ASSERTION, layout.getType());
         assertEquals(SP12Constants.LAYOUT, layout.getName());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -25,6 +25,8 @@ import org.junit.Test;
 import java.util.Iterator;
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
+
 public class PolicyNormalizationTest extends AbstractTestBase {
 
     @Test
@@ -48,4 +50,4 @@ public class PolicyNormalizationTest ext
         serializedPolicy = serializePolicy(policy);
         assertXMLisEqual(serializedPolicy, normalizedPolicyReferenceFile);
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,11 @@ import org.junit.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;
+
 public class RecipientTokenTest extends AbstractTestBase {
 
     @Test
@@ -87,4 +92,4 @@ public class RecipientTokenTest extends
         assertNotNull(recipientToken.getToken());
         assertEquals(SP12Constants.X509_TOKEN, recipientToken.getToken().getName());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,10 @@ import org.junit.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;
+
 public class RelTokenTest extends AbstractTestBase {
 
     @Test
@@ -87,4 +91,4 @@ public class RelTokenTest extends Abstra
         assertEquals(RelToken.RelTokenType.WssRelV20Token10, relToken.getRelTokenType());
         assertTrue(relToken.isRequireKeyIdentifierReference());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,10 @@ import org.junit.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;
+
 public class RequiredElementsTest extends AbstractTestBase {
 
     @Test
@@ -87,4 +91,4 @@ public class RequiredElementsTest extend
         assertEquals("1.1", requiredElements.getXPathVersion());
         assertEquals(2, requiredElements.getXPaths().size());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,10 @@ import org.junit.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;
+
 public class RequiredPartsTest extends AbstractTestBase {
 
     @Test
@@ -85,4 +89,4 @@ public class RequiredPartsTest extends A
         assertEquals(SP12Constants.REQUIRED_PARTS, requiredParts.getName());
         assertEquals(2, requiredParts.getHeaders().size());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,11 @@ import org.junit.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;
+
 public class SamlTokenTest extends AbstractTestBase {
 
     @Test
@@ -89,4 +94,4 @@ public class SamlTokenTest extends Abstr
         assertTrue(samlToken.isRequireKeyIdentifierReference());
         assertNotNull(samlToken.getClaims());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,11 @@ import org.junit.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;
+
 public class SecureConversationTokenTest extends AbstractTestBase {
 
     @Test
@@ -91,4 +96,4 @@ public class SecureConversationTokenTest
         assertTrue(secureConversationToken.isMustNotSendCancel());
         assertNotNull(secureConversationToken.getBootstrapPolicy());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,10 @@ import org.junit.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;
+
 public class SecurityContextTokenTest extends AbstractTestBase {
 
     @Test
@@ -87,4 +91,4 @@ public class SecurityContextTokenTest ex
         assertTrue(securityContextToken.isRequireExternalUriReference());
         assertTrue(securityContextToken.isSc13SecurityContextToken());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,10 @@ import org.junit.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;
+
 public class SignedElementsTest extends AbstractTestBase {
 
     @Test
@@ -147,4 +151,4 @@ public class SignedElementsTest extends
         assertEquals("1.1", signedElements.getXPathVersion());
         assertEquals(3, signedElements.getXPaths().size());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,11 @@ import org.junit.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;
+
 public class SignedPartsTest extends AbstractTestBase {
 
     @Test
@@ -151,4 +156,4 @@ public class SignedPartsTest extends Abs
         assertNotNull(signedParts.getAttachments());
         assertEquals(2, signedParts.getHeaders().size());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,10 @@ import org.junit.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;
+
 public class SpnegoContextTokenTest extends AbstractTestBase {
 
     @Test
@@ -89,4 +93,4 @@ public class SpnegoContextTokenTest exte
         assertTrue(spnegoContextToken.isMustNotSendCancel());
         assertTrue(spnegoContextToken.isMustNotSendRenew());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,11 @@ import org.junit.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;
+
 public class SupportingTokensTest extends AbstractTestBase {
 
     @Test
@@ -95,4 +100,4 @@ public class SupportingTokensTest extend
         assertNotNull(supportingTokens.getEncryptedElements());
         assertNotNull(supportingTokens.getAlgorithmSuite());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -27,6 +27,11 @@ import org.junit.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;
+
 public class SymmetricBindingTest extends AbstractTestBase {
 
     @Test
@@ -102,4 +107,4 @@ public class SymmetricBindingTest extend
         assertTrue(symmetricBinding.isOnlySignEntireHeadersAndBody());
         assertTrue(symmetricBinding.isProtectTokens());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,11 @@ import org.junit.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;
+
 public class TransportBindingTest extends AbstractTestBase {
 
     @Test
@@ -91,4 +96,4 @@ public class TransportBindingTest extend
         assertNotNull(transportBinding.getLayout());
         assertTrue(transportBinding.isIncludeTimestamp());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,10 @@ import org.junit.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;
+
 public class Trust10Test extends AbstractTestBase {
 
     @Test
@@ -93,4 +97,4 @@ public class Trust10Test extends Abstrac
         assertTrue(trust13.isRequireServerEntropy());
         assertTrue(trust13.isMustSupportIssuedTokens());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -27,6 +27,10 @@ import org.junit.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;
+
 public class Trust13Test extends AbstractTestBase {
 
     @Test
@@ -176,4 +180,4 @@ public class Trust13Test extends Abstrac
         assertTrue(trust13.isScopePolicy15());
         assertTrue(trust13.isMustSupportInteractiveChallenge());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,11 @@ import org.junit.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;
+
 public class UsernameTokenTest extends AbstractTestBase {
 
     @Test
@@ -151,4 +156,4 @@ public class UsernameTokenTest extends A
         assertNull(usernameToken.getPasswordType());
         assertEquals(UsernameToken.UsernameTokenType.WssUsernameToken10, usernameToken.getUsernameTokenType());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,10 @@ import org.junit.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;
+
 public class Wss10Test extends AbstractTestBase {
 
     @Test
@@ -91,4 +95,4 @@ public class Wss10Test extends AbstractT
         assertTrue(wss10.isMustSupportRefIssuerSerial());
         assertTrue(wss10.isMustSupportRefKeyIdentifier());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,10 @@ import org.junit.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;
+
 public class Wss11Test extends AbstractTestBase {
 
     @Test
@@ -97,4 +101,4 @@ public class Wss11Test extends AbstractT
         assertTrue(wss11.isMustSupportRefThumbprint());
         assertTrue(wss11.isRequireSignatureConfirmation());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -26,6 +26,10 @@ import org.junit.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;
+
 public class X509TokenTest extends AbstractTestBase {
 
     @Test
@@ -93,4 +97,4 @@ public class X509TokenTest extends Abstr
         assertTrue(x509Token.isRequireThumbprintReference());
         assertEquals(X509Token.TokenType.WssX509V1Token11, x509Token.getTokenType());
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -18,144 +18,146 @@
  */
 package org.apache.wss4j.common.attachment;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.apache.wss4j.common.util.AttachmentUtils;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 public class AttachmentTest {
 
     @Test
     public void testMatch() {
-        Assert.assertTrue("text/xml".matches("(?i)(text/xml).*"));
-        Assert.assertTrue("TEXT/XML".matches("(?i)(text/xml).*"));
-        Assert.assertTrue("application/xml".matches("(?i)(application/xml).*"));
-        Assert.assertTrue("APPLICATION/XML".matches("(?i)(application/xml).*"));
-        Assert.assertTrue("text/plain".matches("(?i)(text/).*"));
-        Assert.assertTrue("TEXT/PLAIN".matches("(?i)(text/).*"));
+        assertTrue("text/xml".matches("(?i)(text/xml).*"));
+        assertTrue("TEXT/XML".matches("(?i)(text/xml).*"));
+        assertTrue("application/xml".matches("(?i)(application/xml).*"));
+        assertTrue("APPLICATION/XML".matches("(?i)(application/xml).*"));
+        assertTrue("text/plain".matches("(?i)(text/).*"));
+        assertTrue("TEXT/PLAIN".matches("(?i)(text/).*"));
     }
 
     @Test
     public void testMimeHeaderUncomment_1() throws Exception {
-        Assert.assertEquals(
+        assertEquals(
                 "\"a\" \"(b)\" c  test",
                 AttachmentUtils.uncomment("\"a\" \"(b)\" c ((\"d\")) test"));
     }
 
     @Test
     public void testMimeHeaderUncomment_2() throws Exception {
-        Assert.assertEquals(
+        assertEquals(
                 "",
                 AttachmentUtils.uncomment("(\"a\" \"(b)\" c ((\"d\")) test)"));
     }
 
     @Test
     public void testMimeHeaderUncomment_3() throws Exception {
-        Assert.assertEquals(
+        assertEquals(
                 "\"a\" \"(\"b\")\" test",
                 AttachmentUtils.uncomment("\"a\" \"(\"b\")\" (c(\"d\"))test"));
     }
 
     @Test
     public void testMimeHeaderUnfold_1() throws Exception {
-        Assert.assertEquals(
+        assertEquals(
                 "\r\n",
                 AttachmentUtils.unfold("\r\n"));
     }
 
     @Test
     public void testMimeHeaderUnfold_2() throws Exception {
-        Assert.assertEquals(
+        assertEquals(
                 "\r\na",
                 AttachmentUtils.unfold("\r\na"));
     }
 
     @Test
     public void testMimeHeaderUnfold_3() throws Exception {
-        Assert.assertEquals(
+        assertEquals(
                 "",
                 AttachmentUtils.unfold("\r\n "));
     }
 
     @Test
     public void testMimeHeaderUnfold_4() throws Exception {
-        Assert.assertEquals(
+        assertEquals(
                 "",
                 AttachmentUtils.unfold("\r\n\t"));
     }
 
     @Test
     public void testMimeHeaderUnfold_5() throws Exception {
-        Assert.assertEquals(
+        assertEquals(
                 "aa",
                 AttachmentUtils.unfold("a\r\n\ta"));
     }
 
     @Test
     public void testMimeHeaderUnfold_6() throws Exception {
-        Assert.assertEquals(
+        assertEquals(
                 "aaa",
                 AttachmentUtils.unfold("a\r\n\taa"));
     }
 
     @Test
     public void testMimeHeaderUnfold_7() throws Exception {
-        Assert.assertEquals(
+        assertEquals(
                 "aaaa",
                 AttachmentUtils.unfold("\r\n\taaaa"));
     }
 
     @Test
     public void testMimeHeaderUnfold_8() throws Exception {
-        Assert.assertEquals(
+        assertEquals(
                 "a",
                 AttachmentUtils.unfold("\r\n\ta\r\n "));
     }
 
     @Test
     public void testMimeHeaderUnfold_9() throws Exception {
-        Assert.assertEquals(
+        assertEquals(
                 "\r\n\ra",
                 AttachmentUtils.unfold("\r\n\ra\r\n "));
     }
 
     @Test
     public void testMimeHeaderUnfold_10() throws Exception {
-        Assert.assertEquals(
+        assertEquals(
                 "\r\n",
                 AttachmentUtils.unfold("\r\n \r\n \r\n"));
     }
 
     @Test
     public void testMimeHeaderUnfoldWS_1() throws Exception {
-        Assert.assertEquals(
+        assertEquals(
                 "a ",
                 AttachmentUtils.unfoldWhitespace(" a "));
     }
 
     @Test
     public void testMimeHeaderUnfoldWS_2() throws Exception {
-        Assert.assertEquals(
+        assertEquals(
                 "",
                 AttachmentUtils.unfoldWhitespace(""));
     }
 
     @Test
     public void testMimeHeaderUnfoldWS_3() throws Exception {
-        Assert.assertEquals(
+        assertEquals(
                 "",
                 AttachmentUtils.unfoldWhitespace(" \t \t\t  "));
     }
 
     @Test
     public void testMimeHeaderUnfoldWS_4() throws Exception {
-        Assert.assertEquals(
+        assertEquals(
                 "a\ta\t  a",
                 AttachmentUtils.unfoldWhitespace(" \t a\ta\t  a"));
     }
 
     @Test
     public void testMimeHeaderDecodeRfc2184_1() throws Exception {
-        Assert.assertEquals(
+        assertEquals(
                 "message/external-body;access-type=\"URL\";" +
                         "test=\"true\";" +
                         "url=\"ftp://cs.utk.edu/pub/moore/bulk-mailer/bulk-mailer.tar\""
@@ -169,7 +171,7 @@ public class AttachmentTest {
 
     @Test
     public void testMimeHeaderDecodeRfc2184_2() throws Exception {
-        Assert.assertEquals(
+        assertEquals(
                 "message/external-body;access-type=\"URL\";" +
                         "url=\"ftp://cs.utk.edu/pub/moore/bulk-mailer/bulk-mailer.tar\"",
                 AttachmentUtils.decodeRfc2184(
@@ -182,7 +184,7 @@ public class AttachmentTest {
 
     @Test
     public void testMimeHeaderDecodeRfc2184_3() throws Exception {
-        Assert.assertEquals(
+        assertEquals(
                 "application/x-stuff;" +
                         "title=\"This is ***fun***\"",
                 AttachmentUtils.decodeRfc2184(
@@ -194,7 +196,7 @@ public class AttachmentTest {
 
     @Test
     public void testMimeHeaderDecodeRfc2184_4() throws Exception {
-        Assert.assertEquals(
+        assertEquals(
                 "application/x-stuff;" +
                         "title=\"This is even more ***fun*** isn't it!\"",
                 AttachmentUtils.decodeRfc2184(
@@ -208,7 +210,7 @@ public class AttachmentTest {
 
     @Test
     public void testMimeHeaderUnquoteInnerText_1() throws Exception {
-        Assert.assertEquals(
+        assertEquals(
                 "\"\\\"\\\"\\\\A\"",
                 AttachmentUtils.unquoteInnerText(
                         "\\\"\"\"\\\\\\A\\\""
@@ -218,11 +220,11 @@ public class AttachmentTest {
 
     @Test
     public void testMimeHeaderUnquoteInnerText_2() throws Exception {
-        Assert.assertEquals(
+        assertEquals(
                 "\"a\"",
                 AttachmentUtils.unquoteInnerText(
                         "\\\"a\\\""
                 )
         );
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -19,12 +19,13 @@
 package org.apache.wss4j.common.attachment;
 
 import org.apache.wss4j.common.util.CRLFOutputStream;
-import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.util.Random;
 
+import static org.junit.Assert.assertArrayEquals;
+
 public class CRLFOutputStreamTest {
 
     @Test
@@ -48,7 +49,7 @@ public class CRLFOutputStreamTest {
         crlfOutputStream.write('a');
         crlfOutputStream.write('a');
         crlfOutputStream.close();
-        Assert.assertArrayEquals("\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\na\r\n\r\naaa".getBytes(), baos.toByteArray());
+        assertArrayEquals("\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\na\r\n\r\naaa".getBytes(), baos.toByteArray());
     }
 
     @Test
@@ -57,7 +58,7 @@ public class CRLFOutputStreamTest {
         CRLFOutputStream crlfOutputStream = new CRLFOutputStream(baos);
         crlfOutputStream.write("\n\r\r\n\n\n\r\r\ra\n\r\naaa".getBytes());
         crlfOutputStream.close();
-        Assert.assertArrayEquals("\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\na\r\n\r\naaa".getBytes(), baos.toByteArray());
+        assertArrayEquals("\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\na\r\n\r\naaa".getBytes(), baos.toByteArray());
     }
 
     @Test
@@ -66,7 +67,7 @@ public class CRLFOutputStreamTest {
         CRLFOutputStream crlfOutputStream = new CRLFOutputStream(baos);
         crlfOutputStream.write("aaaaaaaaaa".getBytes());
         crlfOutputStream.close();
-        Assert.assertArrayEquals("aaaaaaaaaa".getBytes(), baos.toByteArray());
+        assertArrayEquals("aaaaaaaaaa".getBytes(), baos.toByteArray());
     }
 
     @Test
@@ -123,4 +124,4 @@ public class CRLFOutputStreamTest {
         }
         return stringBuilder.toString();
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -25,13 +25,15 @@ import net.sf.ehcache.config.CacheConfig
 import net.sf.ehcache.config.Configuration;
 import net.sf.ehcache.config.ConfigurationFactory;
 
-import org.junit.Assert;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 /**
  *
  */
-public class EHCacheManagerHolderTest extends Assert {
+public class EHCacheManagerHolderTest {
 
     @Test
     public void testCreateCacheManager() {
@@ -78,4 +80,4 @@ public class EHCacheManagerHolderTest ex
         assertEquals(3600, cacheConfig3.getTimeToIdleSeconds());
 
     }
-}
+}
\ No newline at end of file

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=1850227&r1=1850226&r2=1850227&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 Thu Jan  3 11:48:56 2019
@@ -24,13 +24,15 @@ import java.net.URL;
 import java.time.Instant;
 import java.util.UUID;
 
-import org.junit.Assert;
 import org.junit.Test;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 /**
  * Some unit tests for the ReplayCache implementations
  */
-public class ReplayCacheTest extends Assert {
+public class ReplayCacheTest {
 
     @Test
     public void testMemoryReplayCache() throws InterruptedException, IOException {
@@ -69,4 +71,4 @@ public class ReplayCacheTest extends Ass
         assertFalse(replayCache.contains(id));
 
     }
-}
+}
\ No newline at end of file



Mime
View raw message