[java-opensaml COMMIT] /trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/config/BasicSecurityConfiguratio...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Apr  4 23:38:08 2014
New Revision: 3767

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3767&view=rev
Log:
Extend the OpenSAML init base test case, so that the global AlgorithmRegistry is initialized.

Modified:
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/config/BasicSecurityConfigurationTest.java

Modified: trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/config/BasicSecurityConfigurationTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/config/BasicSecurityConfigurationTest.java?rev=3767&r1=3766&r2=3767&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/config/BasicSecurityConfigurationTest.java (original)
+++ trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/config/BasicSecurityConfigurationTest.java Fri Apr  4 23:38:08 2014
@@ -17,24 +17,23 @@
 
 package org.opensaml.xmlsec.config;
 
-import org.testng.annotations.Test;
-import org.testng.annotations.BeforeMethod;
-import org.testng.Assert;
 import java.security.KeyPair;
 
-import org.apache.xml.security.Init;
+import org.opensaml.core.OpenSAMLInitBaseTestCase;
 import org.opensaml.security.credential.Credential;
 import org.opensaml.security.credential.CredentialSupport;
 import org.opensaml.security.crypto.KeySupport;
 import org.opensaml.xmlsec.algorithm.AlgorithmSupport;
-import org.opensaml.xmlsec.config.BasicSecurityConfiguration;
 import org.opensaml.xmlsec.encryption.support.EncryptionConstants;
 import org.opensaml.xmlsec.signature.support.SignatureConstants;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
 /**
  * Testing some aspects of the basic security config impl.
  */
-public class BasicSecurityConfigurationTest {
+public class BasicSecurityConfigurationTest extends OpenSAMLInitBaseTestCase {
     
     private BasicSecurityConfiguration config;
     
@@ -43,10 +42,6 @@
 
     @BeforeMethod
     protected void setUp() throws Exception {
-        if (!Init.isInitialized()) {
-            Init.init();
-        }
-        
         KeyPair kp = KeySupport.generateKeyPair("RSA", 1024, null);
         rsaCred = CredentialSupport.getSimpleCredential(kp.getPublic(), kp.getPrivate());
         aes128Cred = AlgorithmSupport.generateSymmetricKeyAndCredential(EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES128);