You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2011/03/16 11:30:51 UTC
svn commit: r1082116 - in
/webservices/wss4j/trunk/src/test/java/org/apache/ws/security:
components/crypto/ handler/ message/ message/token/ saml/
Author: coheigea
Date: Wed Mar 16 10:30:50 2011
New Revision: 1082116
URL: http://svn.apache.org/viewvc?rev=1082116&view=rev
Log:
Added WSSConfig.init() calls to the tests to get them to pass with JDK 1.5.
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/CertificateStoreTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/CryptoTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/handler/CustomActionProcessorTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/ModifiedRequestTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/NoSoapPrefixSignatureTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SKISignatureTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/STRSignatureTest.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/SignatureKeyValueTest.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/SymmetricSignatureTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/BSTKerberosTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlNegativeTest.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/SamlTokenSVTest.java
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/CertificateStoreTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/CertificateStoreTest.java?rev=1082116&r1=1082115&r2=1082116&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/CertificateStoreTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/CertificateStoreTest.java Wed Mar 16 10:30:50 2011
@@ -54,6 +54,7 @@ public class CertificateStoreTest extend
cryptoType.setAlias("wss40");
X509Certificate[] certs = senderCrypto.getX509Certificates(cryptoType);
receiverCrypto = new CertificateStore(certs);
+ WSSConfig.init();
}
/**
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/CryptoTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/CryptoTest.java?rev=1082116&r1=1082115&r2=1082116&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/CryptoTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/CryptoTest.java Wed Mar 16 10:30:50 2011
@@ -23,6 +23,7 @@ import java.io.InputStream;
import java.security.KeyStore;
import org.apache.ws.security.WSConstants;
+import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.common.CustomCrypto;
@@ -34,6 +35,10 @@ import org.w3c.dom.Document;
public class CryptoTest extends org.junit.Assert {
+ public CryptoTest() {
+ WSSConfig.init();
+ }
+
@org.junit.Test
public void testCrypto() throws Exception {
Crypto crypto = CryptoFactory.getInstance();
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/handler/CustomActionProcessorTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/handler/CustomActionProcessorTest.java?rev=1082116&r1=1082115&r2=1082116&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/handler/CustomActionProcessorTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/handler/CustomActionProcessorTest.java Wed Mar 16 10:30:50 2011
@@ -49,6 +49,7 @@ public class CustomActionProcessorTest e
private Crypto crypto = null;
public CustomActionProcessorTest() throws Exception {
+ WSSConfig.init();
crypto = CryptoFactory.getInstance();
}
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/ModifiedRequestTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/ModifiedRequestTest.java?rev=1082116&r1=1082115&r2=1082116&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/ModifiedRequestTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/ModifiedRequestTest.java Wed Mar 16 10:30:50 2011
@@ -23,6 +23,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSEncryptionPart;
+import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.common.KeystoreCallbackHandler;
@@ -60,6 +61,7 @@ public class ModifiedRequestTest extends
private Crypto crypto = null;
public ModifiedRequestTest() throws Exception {
+ WSSConfig.init();
crypto = CryptoFactory.getInstance();
}
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/NoSoapPrefixSignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/NoSoapPrefixSignatureTest.java?rev=1082116&r1=1082115&r2=1082116&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/NoSoapPrefixSignatureTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/NoSoapPrefixSignatureTest.java Wed Mar 16 10:30:50 2011
@@ -21,6 +21,7 @@ package org.apache.ws.security.message;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.common.SOAPUtil;
@@ -38,6 +39,7 @@ public class NoSoapPrefixSignatureTest e
private Crypto crypto = null;
public NoSoapPrefixSignatureTest() throws Exception {
+ WSSConfig.init();
crypto = CryptoFactory.getInstance();
}
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SKISignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SKISignatureTest.java?rev=1082116&r1=1082115&r2=1082116&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SKISignatureTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SKISignatureTest.java Wed Mar 16 10:30:50 2011
@@ -21,6 +21,7 @@ package org.apache.ws.security.message;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.common.SOAPUtil;
@@ -40,6 +41,7 @@ public class SKISignatureTest extends or
private Crypto crypto = null;
public SKISignatureTest() throws Exception {
+ WSSConfig.init();
crypto = CryptoFactory.getInstance("wss40.properties");
}
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/STRSignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/STRSignatureTest.java?rev=1082116&r1=1082115&r2=1082116&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/STRSignatureTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/STRSignatureTest.java Wed Mar 16 10:30:50 2011
@@ -24,6 +24,7 @@ import org.apache.commons.logging.LogFac
import org.apache.ws.security.SOAPConstants;
import org.apache.ws.security.WSEncryptionPart;
import org.apache.ws.security.WSConstants;
+import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.util.WSSecurityUtil;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.common.SOAPUtil;
@@ -46,6 +47,7 @@ public class STRSignatureTest extends or
private Crypto crypto = null;
public STRSignatureTest() throws Exception {
+ WSSConfig.init();
crypto = CryptoFactory.getInstance("wss40.properties");
}
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=1082116&r1=1082115&r2=1082116&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 Wed Mar 16 10:30:50 2011
@@ -74,6 +74,7 @@ public class SignatureCertTest extends o
private Crypto cryptoCA = null;
public SignatureCertTest() throws Exception {
+ WSSConfig.init();
crypto = CryptoFactory.getInstance("wss40.properties");
cryptoCA = CryptoFactory.getInstance("wss40CA.properties");
}
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureKeyValueTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureKeyValueTest.java?rev=1082116&r1=1082115&r2=1082116&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureKeyValueTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SignatureKeyValueTest.java Wed Mar 16 10:30:50 2011
@@ -44,6 +44,7 @@ public class SignatureKeyValueTest exten
private Crypto crypto = null;
public SignatureKeyValueTest() throws Exception {
+ WSSConfig.init();
crypto = CryptoFactory.getInstance("wss40.properties");
}
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=1082116&r1=1082115&r2=1082116&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 Wed Mar 16 10:30:50 2011
@@ -24,6 +24,7 @@ import org.apache.commons.logging.LogFac
import org.apache.ws.security.SOAPConstants;
import org.apache.ws.security.WSDataRef;
import org.apache.ws.security.WSEncryptionPart;
+import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSecurityEngineResult;
@@ -80,6 +81,7 @@ public class SignaturePartsTest extends
private Crypto crypto = null;
public SignaturePartsTest() throws Exception {
+ WSSConfig.init();
crypto = CryptoFactory.getInstance();
}
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=1082116&r1=1082115&r2=1082116&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 Wed Mar 16 10:30:50 2011
@@ -55,6 +55,7 @@ public class SignatureTest extends org.j
private Crypto crypto = null;
public SignatureTest() throws Exception {
+ WSSConfig.init();
crypto = CryptoFactory.getInstance();
}
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SymmetricSignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SymmetricSignatureTest.java?rev=1082116&r1=1082115&r2=1082116&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SymmetricSignatureTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/SymmetricSignatureTest.java Wed Mar 16 10:30:50 2011
@@ -61,6 +61,7 @@ public class SymmetricSignatureTest exte
private Crypto crypto = null;
public SymmetricSignatureTest() throws Exception {
+ WSSConfig.init();
crypto = CryptoFactory.getInstance();
}
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/BSTKerberosTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/BSTKerberosTest.java?rev=1082116&r1=1082115&r2=1082116&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/BSTKerberosTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/token/BSTKerberosTest.java Wed Mar 16 10:30:50 2011
@@ -59,6 +59,7 @@ public class BSTKerberosTest extends org
private Crypto crypto = null;
public BSTKerberosTest() throws Exception {
+ WSSConfig.init();
crypto = CryptoFactory.getInstance();
}
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlNegativeTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlNegativeTest.java?rev=1082116&r1=1082115&r2=1082116&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlNegativeTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlNegativeTest.java Wed Mar 16 10:30:50 2011
@@ -22,6 +22,7 @@ package org.apache.ws.security.saml;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSConstants;
+import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.WSSecurityException;
@@ -69,6 +70,7 @@ public class SamlNegativeTest extends or
private Crypto userCrypto = CryptoFactory.getInstance("wss40.properties");
public SamlNegativeTest() throws Exception {
+ WSSConfig.init();
// Load the issuer keystore
issuerCrypto = new Merlin();
KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
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=1082116&r1=1082115&r2=1082116&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 Wed Mar 16 10:30:50 2011
@@ -24,6 +24,7 @@ import org.apache.commons.logging.LogFac
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSDataRef;
import org.apache.ws.security.WSEncryptionPart;
+import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.common.KeystoreCallbackHandler;
@@ -67,6 +68,7 @@ public class SamlReferenceTest extends o
private Crypto userCrypto = CryptoFactory.getInstance("wss40.properties");
public SamlReferenceTest() throws Exception {
+ WSSConfig.init();
// Load the issuer keystore
issuerCrypto = new Merlin();
KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
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=1082116&r1=1082115&r2=1082116&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 Wed Mar 16 10:30:50 2011
@@ -23,6 +23,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSConstants;
+import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.common.SAML1CallbackHandler;
@@ -52,6 +53,7 @@ public class SamlTokenHOKTest extends or
private Crypto crypto = null;
public SamlTokenHOKTest() throws Exception {
+ WSSConfig.init();
crypto = CryptoFactory.getInstance("crypto.properties");
}
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenSVTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenSVTest.java?rev=1082116&r1=1082115&r2=1082116&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenSVTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenSVTest.java Wed Mar 16 10:30:50 2011
@@ -59,6 +59,7 @@ public class SamlTokenSVTest extends org
private Crypto crypto = null;
public SamlTokenSVTest() throws Exception {
+ WSSConfig.init();
crypto = CryptoFactory.getInstance("crypto.properties");
}
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=1082116&r1=1082115&r2=1082116&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 Wed Mar 16 10:30:50 2011
@@ -23,6 +23,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSDataRef;
+import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.common.KeystoreCallbackHandler;
@@ -63,6 +64,7 @@ public class SignedSamlTokenHOKTest exte
private Crypto userCrypto = CryptoFactory.getInstance("wss40.properties");
public SignedSamlTokenHOKTest() throws Exception {
+ WSSConfig.init();
// Load the issuer keystore
issuerCrypto = new Merlin();
KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());