You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by gi...@apache.org on 2012/03/26 21:57:26 UTC
svn commit: r1305521 -
/webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/InboundWSSecurityContextImplTest.java
Author: giger
Date: Mon Mar 26 19:57:26 2012
New Revision: 1305521
URL: http://svn.apache.org/viewvc?rev=1305521&view=rev
Log:
fix test
Modified:
webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/InboundWSSecurityContextImplTest.java
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/InboundWSSecurityContextImplTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/InboundWSSecurityContextImplTest.java?rev=1305521&r1=1305520&r2=1305521&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/InboundWSSecurityContextImplTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/InboundWSSecurityContextImplTest.java Mon Mar 26 19:57:26 2012
@@ -164,6 +164,9 @@ public class InboundWSSecurityContextImp
boolean mainSignatureTokenOccured = false;
boolean signedEndorsingSupportingTokenOccured = false;
+ boolean signedEndorsingEncryptedSupportingTokenOccured = false;
+ boolean supportingTokensOccured = false;
+ boolean encryptedSupportingTokensOccured = false;
boolean mainEncryptionTokenOccured = false;
boolean usernameTokenOccured = false;
Assert.assertEquals(securityEventList.size(), 34);
@@ -187,19 +190,19 @@ public class InboundWSSecurityContextImp
X509TokenSecurityEvent tokenSecurityEvent = (X509TokenSecurityEvent) securityEvent;
Assert.assertEquals(tokenSecurityEvent.getSecurityToken().getTokenUsages().size(), 1);
Assert.assertTrue(tokenSecurityEvent.getSecurityToken().getTokenUsages().contains(SecurityToken.TokenUsage.EncryptedSupportingTokens));
- mainSignatureTokenOccured = true;
+ encryptedSupportingTokensOccured = true;
} else if (securityEvent instanceof X509TokenSecurityEvent && x509TokenIndex == 3) {
x509TokenIndex++;
X509TokenSecurityEvent tokenSecurityEvent = (X509TokenSecurityEvent) securityEvent;
Assert.assertEquals(tokenSecurityEvent.getSecurityToken().getTokenUsages().size(), 1);
Assert.assertTrue(tokenSecurityEvent.getSecurityToken().getTokenUsages().contains(SecurityToken.TokenUsage.SupportingTokens));
- mainSignatureTokenOccured = true;
+ supportingTokensOccured = true;
} else if (securityEvent instanceof X509TokenSecurityEvent && x509TokenIndex == 4) {
x509TokenIndex++;
X509TokenSecurityEvent tokenSecurityEvent = (X509TokenSecurityEvent) securityEvent;
Assert.assertEquals(tokenSecurityEvent.getSecurityToken().getTokenUsages().size(), 1);
Assert.assertTrue(tokenSecurityEvent.getSecurityToken().getTokenUsages().contains(SecurityToken.TokenUsage.SignedEndorsingEncryptedSupportingTokens));
- mainSignatureTokenOccured = true;
+ signedEndorsingEncryptedSupportingTokenOccured = true;
} else if (securityEvent instanceof X509TokenSecurityEvent && x509TokenIndex == 5) {
x509TokenIndex++;
X509TokenSecurityEvent tokenSecurityEvent = (X509TokenSecurityEvent) securityEvent;
@@ -217,6 +220,9 @@ public class InboundWSSecurityContextImp
Assert.assertTrue(mainSignatureTokenOccured);
Assert.assertTrue(mainEncryptionTokenOccured);
Assert.assertTrue(signedEndorsingSupportingTokenOccured);
+ Assert.assertTrue(signedEndorsingEncryptedSupportingTokenOccured);
+ Assert.assertTrue(supportingTokensOccured);
+ Assert.assertTrue(encryptedSupportingTokensOccured);
Assert.assertTrue(usernameTokenOccured);
}