Author: coheigea
Date: Tue Jun 21 12:29:57 2011
New Revision: 1137977
URL: http://svn.apache.org/viewvc?rev=1137977&view=rev
Log:
Switching from assert -> assertTrue plus some other changes to the tests
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/handler/SignatureConfirmationTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/EncryptionPartsTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/EncryptionTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureCRLTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureCertTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignaturePartsTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/TimestampTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTDerivedKeyTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTSignatureTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTWseSignatureTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/BinarySecurityTokenTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/SecurityTokenReferenceTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/misc/FaultCodeTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/misc/PrincipalTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/misc/SecurityHeaderTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/validate/ValidatorTest.java
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/handler/SignatureConfirmationTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/handler/SignatureConfirmationTest.java?rev=1137977&r1=1137976&r2=1137977&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/handler/SignatureConfirmationTest.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/handler/SignatureConfirmationTest.java
Tue Jun 21 12:29:57 2011
@@ -292,7 +292,7 @@ public class SignatureConfirmationTest e
newEngine.processSecurityHeader(doc, null, callbackHandler,
crypto);
fail("Failure expected on a request with no wsu:Id");
} catch (WSSecurityException ex) {
- assert ex.getMessage().contains("wsu:Id");
+ assertTrue(ex.getMessage().contains("wsu:Id"));
}
}
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/EncryptionPartsTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/EncryptionPartsTest.java?rev=1137977&r1=1137976&r2=1137977&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/EncryptionPartsTest.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/EncryptionPartsTest.java
Tue Jun 21 12:29:57 2011
@@ -361,7 +361,7 @@ public class EncryptionPartsTest extends
"Incorrect N/S",
"");
Element bodyElement = WSSecurityUtil.findBodyElement(doc);
- assert bodyElement != null &&
"Body".equals(bodyElement.getLocalName());
+ assertTrue(bodyElement != null &&
"Body".equals(bodyElement.getLocalName()));
encP.setElement(bodyElement);
parts.add(encP);
encrypt.setParts(parts);
@@ -409,14 +409,14 @@ public class EncryptionPartsTest extends
if (LOG.isDebugEnabled()) {
LOG.debug(outputString);
}
- assert !outputString.contains("testMethod");
+ assertTrue(!outputString.contains("testMethod"));
verify(encryptedDoc);
outputString =
org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
- assert outputString.contains("asf1");
- assert outputString.contains("asf2");
+ assertTrue(outputString.contains("asf1"));
+ assertTrue(outputString.contains("asf2"));
}
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/EncryptionTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/EncryptionTest.java?rev=1137977&r1=1137976&r2=1137977&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/EncryptionTest.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/EncryptionTest.java
Tue Jun 21 12:29:57 2011
@@ -562,7 +562,7 @@ public class EncryptionTest extends org.
newEngine.processSecurityHeader(encryptedDoc, null,
keystoreCallbackHandler, crypto);
fail("Failure expected on a bad attribute type");
} catch (WSSecurityException ex) {
- assert ex.getMessage().contains("bad attribute");
+ assertTrue(ex.getMessage().contains("bad attribute"));
}
}
@@ -593,7 +593,6 @@ public class EncryptionTest extends org.
String outputString =
org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
- System.out.println(outputString);
if (LOG.isDebugEnabled()) {
LOG.debug(outputString);
}
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureCRLTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureCRLTest.java?rev=1137977&r1=1137976&r2=1137977&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureCRLTest.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureCRLTest.java
Tue Jun 21 12:29:57 2011
@@ -136,8 +136,8 @@ public class SignatureCRLTest extends or
} catch (Exception ex) {
String errorMessage = ex.getMessage();
// Different errors using different JDKs...
- assert errorMessage.contains("Certificate has been revoked")
- || errorMessage.contains("Certificate revocation");
+ assertTrue(errorMessage.contains("Certificate has been revoked")
+ || errorMessage.contains("Certificate revocation"));
}
}
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureCertTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureCertTest.java?rev=1137977&r1=1137976&r2=1137977&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureCertTest.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureCertTest.java
Tue Jun 21 12:29:57 2011
@@ -213,7 +213,7 @@ public class SignatureCertTest extends o
try {
verify(signedDoc, cryptoCA);
- throw new Exception("Failure expected on issuer serial");
+ fail("Failure expected on issuer serial");
} catch (WSSecurityException ex) {
assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_CHECK);
// expected
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignaturePartsTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignaturePartsTest.java?rev=1137977&r1=1137976&r2=1137977&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignaturePartsTest.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignaturePartsTest.java
Tue Jun 21 12:29:57 2011
@@ -225,7 +225,7 @@ public class SignaturePartsTest extends
AssertionWrapper receivedAssertion =
(AssertionWrapper)
stUnsignedActionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert receivedAssertion.isSigned();
+ assertTrue(receivedAssertion.isSigned());
WSSecurityEngineResult signActionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
@@ -404,7 +404,7 @@ public class SignaturePartsTest extends
"Incorrect N/S",
"");
Element bodyElement = WSSecurityUtil.findBodyElement(doc);
- assert bodyElement != null &&
"Body".equals(bodyElement.getLocalName());
+ assertTrue(bodyElement != null &&
"Body".equals(bodyElement.getLocalName()));
encP.setElement(bodyElement);
parts.add(encP);
sign.setParts(parts);
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureTest.java?rev=1137977&r1=1137976&r2=1137977&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureTest.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureTest.java
Tue Jun 21 12:29:57 2011
@@ -172,7 +172,7 @@ public class SignatureTest extends org.j
newEngine.processSecurityHeader(doc, null, null, crypto);
fail("Failure expected on a bad c14n algorithm");
} catch (WSSecurityException ex) {
- assert ex.getMessage().contains("bad canonicalization algorithm");
+ assertTrue(ex.getMessage().contains("bad canonicalization
algorithm"));
}
}
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/TimestampTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/TimestampTest.java?rev=1137977&r1=1137976&r2=1137977&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/TimestampTest.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/TimestampTest.java
Tue Jun 21 12:29:57 2011
@@ -605,7 +605,7 @@ public class TimestampTest extends org.j
verify(doc, wssConfig);
fail("The timestamp validation should have failed");
} catch (WSSecurityException ex) {
- assert ex.getMessage().contains("Unparseable date");
+ assertTrue(ex.getMessage().contains("Unparseable date"));
}
}
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTDerivedKeyTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTDerivedKeyTest.java?rev=1137977&r1=1137976&r2=1137977&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTDerivedKeyTest.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTDerivedKeyTest.java
Tue Jun 21 12:29:57 2011
@@ -257,7 +257,7 @@ public class UTDerivedKeyTest extends or
try {
verify(encryptedDoc);
- throw new Exception("Failure expected on a bad derived
encryption");
+ fail("Failure expected on a bad derived encryption");
} catch (WSSecurityException ex) {
assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_CHECK);
// expected
@@ -308,7 +308,7 @@ public class UTDerivedKeyTest extends or
try {
verify(encryptedDoc);
- throw new Exception("Failure expected on a bad derived
encryption");
+ fail("Failure expected on a bad derived encryption");
} catch (WSSecurityException ex) {
assertTrue(ex.getErrorCode() ==
WSSecurityException.FAILED_AUTHENTICATION);
// expected
@@ -459,7 +459,7 @@ public class UTDerivedKeyTest extends or
try {
verify(signedDoc);
- throw new Exception("Failure expected on a bad derived signature");
+ fail("Failure expected on a bad derived signature");
} catch (WSSecurityException ex) {
assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_CHECK);
// expected
@@ -505,7 +505,7 @@ public class UTDerivedKeyTest extends or
try {
verify(signedDoc);
- throw new Exception("Failure expected on a bad derived signature");
+ fail("Failure expected on a bad derived signature");
} catch (WSSecurityException ex) {
assertTrue(ex.getErrorCode() ==
WSSecurityException.FAILED_AUTHENTICATION);
// expected
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTSignatureTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTSignatureTest.java?rev=1137977&r1=1137976&r2=1137977&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTSignatureTest.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTSignatureTest.java
Tue Jun 21 12:29:57 2011
@@ -133,7 +133,7 @@ public class UTSignatureTest extends org
try {
verify(signedDoc);
- throw new Exception("Failure expected on a bad derived signature");
+ fail("Failure expected on a bad derived signature");
} catch (WSSecurityException ex) {
assertTrue(ex.getErrorCode() ==
WSSecurityException.FAILED_AUTHENTICATION);
// expected
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTWseSignatureTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTWseSignatureTest.java?rev=1137977&r1=1137976&r2=1137977&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTWseSignatureTest.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/UTWseSignatureTest.java
Tue Jun 21 12:29:57 2011
@@ -129,7 +129,7 @@ public class UTWseSignatureTest extends
//
try {
secEngine.processSecurityHeader(doc, null, callbackHandler, null);
- fail ("An error was expected on verifying the signature");
+ fail("An error was expected on verifying the signature");
} catch (Exception ex) {
// expected
}
@@ -177,7 +177,7 @@ public class UTWseSignatureTest extends
//
try {
secEngine.processSecurityHeader(doc, null, callbackHandler, null);
- fail ("An error was expected on verifying the signature");
+ fail("An error was expected on verifying the signature");
} catch (Exception ex) {
// expected
}
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/BinarySecurityTokenTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/BinarySecurityTokenTest.java?rev=1137977&r1=1137976&r2=1137977&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/BinarySecurityTokenTest.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/BinarySecurityTokenTest.java
Tue Jun 21 12:29:57 2011
@@ -83,7 +83,7 @@ public class BinarySecurityTokenTest ext
WSSecurityUtil.fetchActionResult(results, WSConstants.BST);
BinarySecurity token =
(BinarySecurity)actionResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
- assert token != null;
+ assertNotNull(token);
BinarySecurity clone = new BinarySecurity(token.getElement());
assertTrue(clone.equals(token));
@@ -126,7 +126,7 @@ public class BinarySecurityTokenTest ext
WSSecurityUtil.fetchActionResult(results, WSConstants.BST);
PKIPathSecurity token =
(PKIPathSecurity)actionResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
- assert token != null;
+ assertNotNull(token);
}
/**
@@ -177,7 +177,7 @@ public class BinarySecurityTokenTest ext
WSSecurityUtil.fetchActionResult(results, WSConstants.BST);
BinarySecurity token =
(BinarySecurity)actionResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
- assert token != null;
+ assertNotNull(token);
}
}
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/SecurityTokenReferenceTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/SecurityTokenReferenceTest.java?rev=1137977&r1=1137976&r2=1137977&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/SecurityTokenReferenceTest.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/SecurityTokenReferenceTest.java
Tue Jun 21 12:29:57 2011
@@ -58,7 +58,7 @@ public class SecurityTokenReferenceTest
new SecurityTokenReference(strElement);
fail("Failure expected on a reference with no URI");
} catch (WSSecurityException ex) {
- assert ex.getMessage().contains("Reference URI is null");
+ assertTrue(ex.getMessage().contains("Reference URI is null"));
}
}
@@ -89,7 +89,7 @@ public class SecurityTokenReferenceTest
new SecurityTokenReference(strElement);
fail("Failure expected on multiple data references");
} catch (WSSecurityException ex) {
- assert ex.getMessage().contains("Cannot handle multiple data
references");
+ assertTrue(ex.getMessage().contains("Cannot handle multiple data
references"));
}
new SecurityTokenReference(strElement, false);
@@ -117,7 +117,7 @@ public class SecurityTokenReferenceTest
new SecurityTokenReference(strElement);
fail("Failure expected on a Key Identifier with no ValueType");
} catch (WSSecurityException ex) {
- assert ex.getMessage().contains("Bad ValueType");
+ assertTrue(ex.getMessage().contains("Bad ValueType"));
}
new SecurityTokenReference(strElement, false);
@@ -150,7 +150,7 @@ public class SecurityTokenReferenceTest
new SecurityTokenReference(strElement);
fail("Failure expected on a Key Identifier with a Bad
EncodingType");
} catch (WSSecurityException ex) {
- assert ex.getMessage().contains("bad EncodingType");
+ assertTrue(ex.getMessage().contains("bad EncodingType"));
}
new SecurityTokenReference(strElement, false);
@@ -183,7 +183,7 @@ public class SecurityTokenReferenceTest
new SecurityTokenReference(strElement);
fail("Failure expected on a Key Identifier with no EncodingType");
} catch (WSSecurityException ex) {
- assert ex.getMessage().contains("No EncodingType");
+ assertTrue(ex.getMessage().contains("No EncodingType"));
}
new SecurityTokenReference(strElement, false);
@@ -244,7 +244,7 @@ public class SecurityTokenReferenceTest
new SecurityTokenReference(strElement);
fail("Failure expected on an Embedded Child with a
SecurityTokenReference child");
} catch (WSSecurityException ex) {
- assert ex.getMessage().contains("embedded Reference is invalid");
+ assertTrue(ex.getMessage().contains("embedded Reference is
invalid"));
}
new SecurityTokenReference(strElement, false);
@@ -280,7 +280,7 @@ public class SecurityTokenReferenceTest
new SecurityTokenReference(strElement);
fail("Failure expected on an Embedded Child with multiple
children");
} catch (WSSecurityException ex) {
- assert ex.getMessage().contains("embedded Reference is invalid");
+ assertTrue(ex.getMessage().contains("embedded Reference is
invalid"));
}
new SecurityTokenReference(strElement, false);
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/misc/FaultCodeTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/misc/FaultCodeTest.java?rev=1137977&r1=1137976&r2=1137977&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/misc/FaultCodeTest.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/misc/FaultCodeTest.java
Tue Jun 21 12:29:57 2011
@@ -70,6 +70,7 @@ public class FaultCodeTest extends org.j
try {
verify(encryptedDoc);
+ fail("Failure expected with a bad password");
} catch (WSSecurityException ex) {
assertTrue(ex.getErrorCode() == 6);
assertTrue(ex.getMessage().startsWith("The signature or decryption
was invalid"));
@@ -87,6 +88,7 @@ public class FaultCodeTest extends org.j
try {
secEngine.getWssConfig();
WSSecurityUtil.getCipherInstance("Bad Algorithm");
+ fail("Failure expected on an unsupported algorithm");
} catch (WSSecurityException ex) {
assertTrue(ex.getErrorCode() == 2);
assertTrue(ex.getMessage().startsWith(
@@ -96,25 +98,6 @@ public class FaultCodeTest extends org.j
}
}
-
- /**
- * Test for the wsse:SecurityTokenUnavailable faultcode. This will fail
due to the
- * argument to loadCertificate.
- */
- @org.junit.Test
- public void testSecurityTokenUnavailable() throws Exception {
- try {
- secEngine.getWssConfig();
- crypto.loadCertificate(new java.io.ByteArrayInputStream(new
byte[]{}));
- } catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == 7);
- assertTrue(ex.getMessage().startsWith(
- "Referenced security token could not be retrieved"));
- QName faultCode = new QName(WSConstants.WSSE_NS,
"SecurityTokenUnavailable");
- assertTrue(ex.getFaultCode().equals(faultCode));
- }
- }
-
/**
* Test for the wsse:MessageExpired faultcode. This will fail due to the
argument
* passed to setTimeToLive.
@@ -131,6 +114,7 @@ public class FaultCodeTest extends org.j
try {
verify(timestampedDoc);
+ fail("Failure expected on an expired message");
} catch (WSSecurityException ex) {
assertTrue(ex.getErrorCode() == 8);
assertTrue(ex.getMessage().startsWith(
@@ -158,6 +142,7 @@ public class FaultCodeTest extends org.j
try {
verify(timestampedDoc);
+ fail("Failure expected on a bad password");
} catch (WSSecurityException ex) {
assertTrue(ex.getErrorCode() == 5);
assertTrue(ex.getMessage().startsWith(
@@ -185,6 +170,7 @@ public class FaultCodeTest extends org.j
try {
new UsernameToken(doc.getDocumentElement());
+ fail("Failure expected on an invalid security token");
} catch (WSSecurityException ex) {
assertTrue(ex.getErrorCode() == 4);
assertTrue(ex.getMessage().startsWith(
@@ -201,6 +187,7 @@ public class FaultCodeTest extends org.j
public void testInvalidSecurity() throws Exception {
try {
new Reference((org.w3c.dom.Element)null);
+ fail("Failure expected on processing the security header");
} catch (WSSecurityException ex) {
assertTrue(ex.getErrorCode() == 3);
assertTrue(ex.getMessage().startsWith(
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/misc/PrincipalTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/misc/PrincipalTest.java?rev=1137977&r1=1137976&r2=1137977&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/misc/PrincipalTest.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/misc/PrincipalTest.java
Tue Jun 21 12:29:57 2011
@@ -82,14 +82,14 @@ public class PrincipalTest extends org.j
List<WSSecurityEngineResult> results = verify(signedDoc, null);
Principal principal =
(Principal)results.get(0).get(WSSecurityEngineResult.TAG_PRINCIPAL);
- assert principal instanceof WSUsernameTokenPrincipal;
- assert "wernerd".equals(principal.getName());
+ assertTrue(principal instanceof WSUsernameTokenPrincipal);
+ assertTrue("wernerd".equals(principal.getName()));
WSUsernameTokenPrincipal userPrincipal =
(WSUsernameTokenPrincipal)principal;
- assert userPrincipal.getCreatedTime() != null;
- assert userPrincipal.getNonce() != null;
- assert userPrincipal.getPassword() != null;
- assert userPrincipal.isPasswordDigest();
- assert
WSConstants.PASSWORD_DIGEST.equals(userPrincipal.getPasswordType());
+ assertTrue(userPrincipal.getCreatedTime() != null);
+ assertTrue(userPrincipal.getNonce() != null);
+ assertTrue(userPrincipal.getPassword() != null);
+ assertTrue(userPrincipal.isPasswordDigest());
+
assertTrue(WSConstants.PASSWORD_DIGEST.equals(userPrincipal.getPasswordType()));
}
/**
@@ -114,9 +114,9 @@ public class PrincipalTest extends org.j
verify(signedDoc, new DummyValidator(),
WSSecurityEngine.USERNAME_TOKEN, null);
Principal principal =
(Principal)results.get(0).get(WSSecurityEngineResult.TAG_PRINCIPAL);
- assert principal instanceof SAMLTokenPrincipal;
- assert principal.getName().contains("uid=joe");
- assert ((SAMLTokenPrincipal)principal).getToken() != null;
+ assertTrue(principal instanceof SAMLTokenPrincipal);
+ assertTrue(principal.getName().contains("uid=joe"));
+ assertTrue(((SAMLTokenPrincipal)principal).getToken() != null);
}
/**
@@ -155,9 +155,9 @@ public class PrincipalTest extends org.j
Principal principal =
(Principal)results.get(0).get(WSSecurityEngineResult.TAG_PRINCIPAL);
- assert principal instanceof SAMLTokenPrincipal;
- assert principal.getName().contains("uid=joe");
- assert ((SAMLTokenPrincipal)principal).getToken() != null;
+ assertTrue(principal instanceof SAMLTokenPrincipal);
+ assertTrue(principal.getName().contains("uid=joe"));
+ assertTrue(((SAMLTokenPrincipal)principal).getToken() != null);
}
/**
@@ -196,9 +196,9 @@ public class PrincipalTest extends org.j
Principal principal =
(Principal)results.get(0).get(WSSecurityEngineResult.TAG_PRINCIPAL);
- assert principal instanceof SAMLTokenPrincipal;
- assert principal.getName().contains("uid=joe");
- assert ((SAMLTokenPrincipal)principal).getToken() != null;
+ assertTrue(principal instanceof SAMLTokenPrincipal);
+ assertTrue(principal.getName().contains("uid=joe"));
+ assertTrue(((SAMLTokenPrincipal)principal).getToken() != null);
}
/**
@@ -239,9 +239,9 @@ public class PrincipalTest extends org.j
Principal principal =
(Principal)results.get(0).get(WSSecurityEngineResult.TAG_PRINCIPAL);
- assert principal instanceof SAMLTokenPrincipal;
- assert principal.getName().contains("uid=joe");
- assert ((SAMLTokenPrincipal)principal).getToken() != null;
+ assertTrue(principal instanceof SAMLTokenPrincipal);
+ assertTrue(principal.getName().contains("uid=joe"));
+ assertTrue(((SAMLTokenPrincipal)principal).getToken() != null);
}
/**
@@ -276,13 +276,13 @@ public class PrincipalTest extends org.j
WSSecurityUtil.fetchActionResult(results, WSConstants.BST);
BinarySecurity token =
(BinarySecurity)actionResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
- assert token != null;
+ assertNotNull(token);
Principal principal =
(Principal)results.get(0).get(WSSecurityEngineResult.TAG_PRINCIPAL);
- assert principal instanceof SAMLTokenPrincipal;
- assert principal.getName().contains("uid=joe");
- assert ((SAMLTokenPrincipal)principal).getToken() != null;
+ assertTrue(principal instanceof SAMLTokenPrincipal);
+ assertTrue(principal.getName().contains("uid=joe"));
+ assertTrue(((SAMLTokenPrincipal)principal).getToken() != null);
}
/**
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/misc/SecurityHeaderTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/misc/SecurityHeaderTest.java?rev=1137977&r1=1137976&r2=1137977&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/misc/SecurityHeaderTest.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/misc/SecurityHeaderTest.java
Tue Jun 21 12:29:57 2011
@@ -90,6 +90,7 @@ public class SecurityHeaderTest extends
Document doc = SOAPUtil.toSOAPPart(DUPLICATE_NULL_ACTOR_MSG);
try {
secEngine.processSecurityHeader(doc, null, null, null);
+ fail("Failure expected on a null actor");
} catch (WSSecurityException ex) {
// expected
}
@@ -103,12 +104,7 @@ public class SecurityHeaderTest extends
Document doc = SOAPUtil.toSOAPPart(DUPLICATE_ACTOR_MSG);
try {
secEngine.processSecurityHeader(doc, "user", null, null);
- } catch (WSSecurityException ex) {
- // expected
- }
-
- try {
- secEngine.processSecurityHeader(doc, "otheruser", null, null);
+ fail("Failure expected on a duplicate actor");
} catch (WSSecurityException ex) {
// expected
}
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java?rev=1137977&r1=1137976&r2=1137977&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java
Tue Jun 21 12:29:57 2011
@@ -120,8 +120,8 @@ public class SamlReferenceTest extends o
LOG.debug("Signed SAML message Key Identifier (sender vouches):");
LOG.debug(outputString);
}
- assert outputString.contains(WSConstants.WSS_SAML_KI_VALUE_TYPE);
- assert outputString.contains(WSConstants.WSS_SAML_TOKEN_TYPE);
+ assertTrue(outputString.contains(WSConstants.WSS_SAML_KI_VALUE_TYPE));
+ assertTrue(outputString.contains(WSConstants.WSS_SAML_TOKEN_TYPE));
List<WSSecurityEngineResult> results = verify(signedDoc, crypto, null);
WSSecurityEngineResult actionResult =
@@ -184,8 +184,8 @@ public class SamlReferenceTest extends o
LOG.debug("Signed SAML message Direct Reference (sender
vouches):");
LOG.debug(outputString);
}
- assert outputString.contains(WSConstants.WSS_SAML_KI_VALUE_TYPE);
- assert outputString.contains(WSConstants.WSS_SAML_TOKEN_TYPE);
+ assertTrue(outputString.contains(WSConstants.WSS_SAML_KI_VALUE_TYPE));
+ assertTrue(outputString.contains(WSConstants.WSS_SAML_TOKEN_TYPE));
List<WSSecurityEngineResult> results = verify(signedDoc, crypto, null);
WSSecurityEngineResult actionResult =
@@ -248,8 +248,8 @@ public class SamlReferenceTest extends o
LOG.debug("Signed SAML message Key Identifier (holder-of-key):");
LOG.debug(outputString);
}
- assert outputString.contains(WSConstants.WSS_SAML_KI_VALUE_TYPE);
- assert outputString.contains(WSConstants.WSS_SAML_TOKEN_TYPE);
+ assertTrue(outputString.contains(WSConstants.WSS_SAML_KI_VALUE_TYPE));
+ assertTrue(outputString.contains(WSConstants.WSS_SAML_TOKEN_TYPE));
List<WSSecurityEngineResult> results = verify(signedDoc, trustCrypto,
null);
WSSecurityEngineResult actionResult =
@@ -257,7 +257,7 @@ public class SamlReferenceTest extends o
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert receivedAssertion.isSigned();
+ assertTrue(receivedAssertion.isSigned());
// Test we processed a signature (SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results,
WSConstants.SIGN);
@@ -312,8 +312,8 @@ public class SamlReferenceTest extends o
LOG.debug("Signed SAML message Direct Reference (holder-of-key):");
LOG.debug(outputString);
}
- assert outputString.contains(WSConstants.WSS_SAML_KI_VALUE_TYPE);
- assert outputString.contains(WSConstants.WSS_SAML_TOKEN_TYPE);
+ assertTrue(outputString.contains(WSConstants.WSS_SAML_KI_VALUE_TYPE));
+ assertTrue(outputString.contains(WSConstants.WSS_SAML_TOKEN_TYPE));
List<WSSecurityEngineResult> results = verify(signedDoc, trustCrypto,
null);
WSSecurityEngineResult actionResult =
@@ -321,7 +321,7 @@ public class SamlReferenceTest extends o
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert receivedAssertion.isSigned();
+ assertTrue(receivedAssertion.isSigned());
// Test we processed a signature (SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results,
WSConstants.SIGN);
@@ -381,8 +381,8 @@ public class SamlReferenceTest extends o
LOG.debug("Encrypted message:");
LOG.debug(outputString);
}
- assert outputString.contains(WSConstants.WSS_SAML_KI_VALUE_TYPE);
- assert outputString.contains(WSConstants.WSS_SAML_TOKEN_TYPE);
+ assertTrue(outputString.contains(WSConstants.WSS_SAML_KI_VALUE_TYPE));
+ assertTrue(outputString.contains(WSConstants.WSS_SAML_TOKEN_TYPE));
verify(encryptedDoc, crypto, crypto);
}
@@ -439,8 +439,8 @@ public class SamlReferenceTest extends o
LOG.debug("Encrypted SAML 1.1 message Key Identifier
(holder-of-key):");
LOG.debug(outputString);
}
- assert outputString.contains(WSConstants.WSS_SAML_KI_VALUE_TYPE);
- assert outputString.contains(WSConstants.WSS_SAML_TOKEN_TYPE);
+ assertTrue(outputString.contains(WSConstants.WSS_SAML_KI_VALUE_TYPE));
+ assertTrue(outputString.contains(WSConstants.WSS_SAML_TOKEN_TYPE));
List<WSSecurityEngineResult> results = verify(doc, trustCrypto,
userCrypto);
WSSecurityEngineResult actionResult =
@@ -448,7 +448,7 @@ public class SamlReferenceTest extends o
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert receivedAssertion.isSigned();
+ assertTrue(receivedAssertion.isSigned());
// Test we processed an encrypted element
actionResult = WSSecurityUtil.fetchActionResult(results,
WSConstants.ENCR);
@@ -515,8 +515,8 @@ public class SamlReferenceTest extends o
LOG.debug("Encrypted SAML 1.1 message Direct Reference
(holder-of-key):");
LOG.debug(outputString);
}
- assert outputString.contains(WSConstants.WSS_SAML_KI_VALUE_TYPE);
- assert outputString.contains(WSConstants.WSS_SAML_TOKEN_TYPE);
+ assertTrue(outputString.contains(WSConstants.WSS_SAML_KI_VALUE_TYPE));
+ assertTrue(outputString.contains(WSConstants.WSS_SAML_TOKEN_TYPE));
List<WSSecurityEngineResult> results = verify(doc, trustCrypto,
userCrypto);
WSSecurityEngineResult actionResult =
@@ -524,7 +524,7 @@ public class SamlReferenceTest extends o
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert receivedAssertion.isSigned();
+ assertTrue(receivedAssertion.isSigned());
// Test we processed an encrypted element
actionResult = WSSecurityUtil.fetchActionResult(results,
WSConstants.ENCR);
@@ -537,7 +537,6 @@ public class SamlReferenceTest extends o
WSDataRef wsDataRef = (WSDataRef)refs.get(0);
String xpath = wsDataRef.getXpath();
assertEquals("/SOAP-ENV:Envelope/SOAP-ENV:Body/add", xpath);
-
}
/**
@@ -575,8 +574,8 @@ public class SamlReferenceTest extends o
LOG.debug("Signed SAML2 message Key Identifier (sender vouches):");
LOG.debug(outputString);
}
- assert outputString.contains(WSConstants.WSS_SAML2_KI_VALUE_TYPE);
- assert outputString.contains(WSConstants.WSS_SAML2_TOKEN_TYPE);
+ assertTrue(outputString.contains(WSConstants.WSS_SAML2_KI_VALUE_TYPE));
+ assertTrue(outputString.contains(WSConstants.WSS_SAML2_TOKEN_TYPE));
List<WSSecurityEngineResult> results = verify(signedDoc, crypto, null);
WSSecurityEngineResult actionResult =
@@ -638,8 +637,8 @@ public class SamlReferenceTest extends o
LOG.debug("Signed SAML2 message Direct Reference (sender
vouches):");
LOG.debug(outputString);
}
- assert !outputString.contains(WSConstants.WSS_SAML2_KI_VALUE_TYPE);
- assert outputString.contains(WSConstants.WSS_SAML2_TOKEN_TYPE);
+
assertTrue(!outputString.contains(WSConstants.WSS_SAML2_KI_VALUE_TYPE));
+ assertTrue(outputString.contains(WSConstants.WSS_SAML2_TOKEN_TYPE));
List<WSSecurityEngineResult> results = verify(signedDoc, crypto, null);
WSSecurityEngineResult actionResult =
@@ -702,8 +701,8 @@ public class SamlReferenceTest extends o
LOG.debug("Signed SAML2 message Key Identifier (holder-of-key):");
LOG.debug(outputString);
}
- assert outputString.contains(WSConstants.WSS_SAML2_KI_VALUE_TYPE);
- assert outputString.contains(WSConstants.WSS_SAML2_TOKEN_TYPE);
+ assertTrue(outputString.contains(WSConstants.WSS_SAML2_KI_VALUE_TYPE));
+ assertTrue(outputString.contains(WSConstants.WSS_SAML2_TOKEN_TYPE));
List<WSSecurityEngineResult> results = verify(signedDoc, trustCrypto,
null);
WSSecurityEngineResult actionResult =
@@ -711,7 +710,7 @@ public class SamlReferenceTest extends o
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert receivedAssertion.isSigned();
+ assertTrue(receivedAssertion.isSigned());
// Test we processed a signature (SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results,
WSConstants.SIGN);
@@ -766,8 +765,8 @@ public class SamlReferenceTest extends o
LOG.debug("Signed SAML2 message Direct Reference
(holder-of-key):");
LOG.debug(outputString);
}
- assert !outputString.contains(WSConstants.WSS_SAML2_KI_VALUE_TYPE);
- assert outputString.contains(WSConstants.WSS_SAML2_TOKEN_TYPE);
+
assertTrue(!outputString.contains(WSConstants.WSS_SAML2_KI_VALUE_TYPE));
+ assertTrue(outputString.contains(WSConstants.WSS_SAML2_TOKEN_TYPE));
List<WSSecurityEngineResult> results = verify(signedDoc, trustCrypto,
null);
WSSecurityEngineResult actionResult =
@@ -775,7 +774,7 @@ public class SamlReferenceTest extends o
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert receivedAssertion.isSigned();
+ assertTrue(receivedAssertion.isSigned());
// Test we processed a signature (SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results,
WSConstants.SIGN);
@@ -841,8 +840,8 @@ public class SamlReferenceTest extends o
LOG.debug("Encrypted SAML 2 message Key Identifier
(holder-of-key):");
LOG.debug(outputString);
}
- assert outputString.contains(WSConstants.WSS_SAML2_KI_VALUE_TYPE);
- assert outputString.contains(WSConstants.WSS_SAML2_TOKEN_TYPE);
+ assertTrue(outputString.contains(WSConstants.WSS_SAML2_KI_VALUE_TYPE));
+ assertTrue(outputString.contains(WSConstants.WSS_SAML2_TOKEN_TYPE));
List<WSSecurityEngineResult> results = verify(doc, trustCrypto,
userCrypto);
WSSecurityEngineResult actionResult =
@@ -850,7 +849,7 @@ public class SamlReferenceTest extends o
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert receivedAssertion.isSigned();
+ assertTrue(receivedAssertion.isSigned());
// Test we processed an encrypted element
actionResult = WSSecurityUtil.fetchActionResult(results,
WSConstants.ENCR);
@@ -917,8 +916,8 @@ public class SamlReferenceTest extends o
LOG.debug("Encrypted SAML 2 message Direct Reference
(holder-of-key):");
LOG.debug(outputString);
}
- assert !outputString.contains(WSConstants.WSS_SAML2_KI_VALUE_TYPE);
- assert outputString.contains(WSConstants.WSS_SAML2_TOKEN_TYPE);
+
assertTrue(!outputString.contains(WSConstants.WSS_SAML2_KI_VALUE_TYPE));
+ assertTrue(outputString.contains(WSConstants.WSS_SAML2_TOKEN_TYPE));
List<WSSecurityEngineResult> results = verify(doc, trustCrypto,
userCrypto);
WSSecurityEngineResult actionResult =
@@ -926,7 +925,7 @@ public class SamlReferenceTest extends o
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert receivedAssertion.isSigned();
+ assertTrue(receivedAssertion.isSigned());
// Test we processed an encrypted element
actionResult = WSSecurityUtil.fetchActionResult(results,
WSConstants.ENCR);
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java?rev=1137977&r1=1137976&r2=1137977&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java
Tue Jun 21 12:29:57 2011
@@ -92,7 +92,7 @@ public class SamlTokenHOKTest extends or
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert receivedAssertion.isSigned();
+ assertTrue(receivedAssertion.isSigned());
}
/**
@@ -125,7 +125,7 @@ public class SamlTokenHOKTest extends or
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert receivedAssertion.isSigned();
+ assertTrue(receivedAssertion.isSigned());
}
/**
@@ -172,7 +172,7 @@ public class SamlTokenHOKTest extends or
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert receivedAssertion.isSigned();
+ assertTrue(receivedAssertion.isSigned());
*/
}
@@ -191,7 +191,6 @@ public class SamlTokenHOKTest extends or
AssertionWrapper assertion = new AssertionWrapper(samlParms);
assertion.signAssertion("16c73ab6-b892-458f-abf5-2f875f74882e",
"security", crypto, false);
-
WSSecSAMLToken wsSign = new WSSecSAMLToken();
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
@@ -213,7 +212,7 @@ public class SamlTokenHOKTest extends or
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert receivedAssertion.isSigned();
+ assertTrue(receivedAssertion.isSigned());
}
/**
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenTest.java?rev=1137977&r1=1137976&r2=1137977&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenTest.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenTest.java
Tue Jun 21 12:29:57 2011
@@ -92,7 +92,7 @@ public class SamlTokenTest extends org.j
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert !receivedAssertion.isSigned();
+ assertTrue(!receivedAssertion.isSigned());
}
/**
@@ -125,7 +125,7 @@ public class SamlTokenTest extends org.j
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert !receivedAssertion.isSigned();
+ assertTrue(!receivedAssertion.isSigned());
}
/**
@@ -162,7 +162,7 @@ public class SamlTokenTest extends org.j
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert !receivedAssertion.isSigned();
+ assertTrue(!receivedAssertion.isSigned());
}
/**
@@ -199,7 +199,7 @@ public class SamlTokenTest extends org.j
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert !receivedAssertion.isSigned();
+ assertTrue(!receivedAssertion.isSigned());
}
/**
@@ -236,7 +236,7 @@ public class SamlTokenTest extends org.j
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert !receivedAssertion.isSigned();
+ assertTrue(!receivedAssertion.isSigned());
}
/**
@@ -273,7 +273,7 @@ public class SamlTokenTest extends org.j
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert !receivedAssertion.isSigned();
+ assertTrue(!receivedAssertion.isSigned());
}
/**
@@ -310,7 +310,7 @@ public class SamlTokenTest extends org.j
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert !receivedAssertion.isSigned();
+ assertTrue(!receivedAssertion.isSigned());
}
/**
@@ -352,7 +352,7 @@ public class SamlTokenTest extends org.j
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert !receivedAssertion.isSigned();
+ assertTrue(!receivedAssertion.isSigned());
}
/**
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java?rev=1137977&r1=1137976&r2=1137977&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java
Tue Jun 21 12:29:57 2011
@@ -127,7 +127,7 @@ public class SignedSamlTokenHOKTest exte
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert receivedAssertion.isSigned();
+ assertTrue(receivedAssertion.isSigned());
// Test we processed a signature (SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results,
WSConstants.SIGN);
@@ -188,7 +188,7 @@ public class SignedSamlTokenHOKTest exte
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert receivedAssertion.isSigned();
+ assertTrue(receivedAssertion.isSigned());
// Test we processed a signature (SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results,
WSConstants.SIGN);
@@ -250,7 +250,7 @@ public class SignedSamlTokenHOKTest exte
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert receivedAssertion.isSigned();
+ assertTrue(receivedAssertion.isSigned());
// Test we processed a signature (SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results,
WSConstants.SIGN);
@@ -313,7 +313,7 @@ public class SignedSamlTokenHOKTest exte
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert receivedAssertion.isSigned();
+ assertTrue(receivedAssertion.isSigned());
// Test we processed a signature (SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results,
WSConstants.SIGN);
@@ -366,7 +366,7 @@ public class SignedSamlTokenHOKTest exte
LOG.debug("SAML 1.1 Authn Assertion Issuer Serial
(holder-of-key):");
LOG.debug(outputString);
}
- assert outputString.contains("X509IssuerSerial");
+ assertTrue(outputString.contains("X509IssuerSerial"));
List<WSSecurityEngineResult> results = verify(signedDoc, userCrypto);
WSSecurityEngineResult actionResult =
@@ -374,7 +374,7 @@ public class SignedSamlTokenHOKTest exte
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert receivedAssertion.isSigned();
+ assertTrue(receivedAssertion.isSigned());
// Test we processed a signature (SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results,
WSConstants.SIGN);
@@ -426,7 +426,7 @@ public class SignedSamlTokenHOKTest exte
LOG.debug("SAML 1.1 Authn Assertion Key Value (holder-of-key):");
LOG.debug(outputString);
}
- assert outputString.contains("KeyValue");
+ assertTrue(outputString.contains("KeyValue"));
List<WSSecurityEngineResult> results = verify(signedDoc, userCrypto);
WSSecurityEngineResult actionResult =
@@ -486,7 +486,7 @@ public class SignedSamlTokenHOKTest exte
LOG.debug("SAML 2 Authn Assertion Key Value (holder-of-key):");
LOG.debug(outputString);
}
- assert outputString.contains("KeyValue");
+ assertTrue(outputString.contains("KeyValue"));
List<WSSecurityEngineResult> results = verify(signedDoc, userCrypto);
WSSecurityEngineResult actionResult =
@@ -494,7 +494,7 @@ public class SignedSamlTokenHOKTest exte
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert receivedAssertion.isSigned();
+ assertTrue(receivedAssertion.isSigned());
// Test we processed a signature (SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results,
WSConstants.SIGN);
@@ -560,7 +560,7 @@ public class SignedSamlTokenHOKTest exte
AssertionWrapper receivedAssertion =
(AssertionWrapper)
actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
assertTrue(receivedAssertion != null);
- assert receivedAssertion.isSigned();
+ assertTrue(receivedAssertion.isSigned());
// Test we processed a signature (SOAP body)
actionResult = WSSecurityUtil.fetchActionResult(results,
WSConstants.SIGN);
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/validate/ValidatorTest.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/validate/ValidatorTest.java?rev=1137977&r1=1137976&r2=1137977&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/validate/ValidatorTest.java
(original)
+++
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/validate/ValidatorTest.java
Tue Jun 21 12:29:57 2011
@@ -121,7 +121,7 @@ public class ValidatorTest extends org.j
newEngine.setWssConfig(config);
try {
newEngine.processSecurityHeader(signedDoc, null, null, cryptoCA);
- throw new Exception("Failure expected on issuer serial");
+ fail("Failure expected on issuer serial");
} catch (WSSecurityException ex) {
assertTrue(ex.getErrorCode() ==
WSSecurityException.FAILED_AUTHENTICATION);
// expected
@@ -206,11 +206,11 @@ public class ValidatorTest extends org.j
WSSecurityUtil.fetchActionResult(results, WSConstants.BST);
BinarySecurity token =
(BinarySecurity)actionResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
- assert token != null;
+ assertTrue(token != null);
AssertionWrapper assertion =
(AssertionWrapper)actionResult.get(WSSecurityEngineResult.TAG_TRANSFORMED_TOKEN);
- assert assertion != null;
+ assertTrue(assertion != null);
}
/**
@@ -254,7 +254,7 @@ public class ValidatorTest extends org.j
WSSecurityUtil.fetchActionResult(results, WSConstants.BST);
BinarySecurity token =
(BinarySecurity)actionResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
- assert token != null;
+ assertTrue(token != null);
}
