[java-opensaml COMMIT] in /trunk: opensaml-security-api/src/test/java/org/opensaml/security/SecurityHelperTest.java o...

[noreply at shibboleth.net]

Author: putmanb
Date: Mon Apr  9 22:09:56 2012
New Revision: 3029

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3029&view=rev
Log:
Clean up some unit tests

Modified:
    trunk/opensaml-security-api/src/test/java/org/opensaml/security/SecurityHelperTest.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/XMLSecurityHelperTest.java

Modified: trunk/opensaml-security-api/src/test/java/org/opensaml/security/SecurityHelperTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-api/src/test/java/org/opensaml/security/SecurityHelperTest.java?rev=3029&r1=3028&r2=3029&view=diff
==============================================================================
--- trunk/opensaml-security-api/src/test/java/org/opensaml/security/SecurityHelperTest.java (original)
+++ trunk/opensaml-security-api/src/test/java/org/opensaml/security/SecurityHelperTest.java Mon Apr  9 22:09:56 2012
@@ -18,7 +18,6 @@
 package org.opensaml.security;
 
 import org.testng.annotations.Test;
-import org.testng.Assert;
 import org.testng.Assert;
 import java.io.InputStream;
 import java.security.KeyPair;
@@ -155,7 +154,6 @@
     }
 
     /** Generic key testing. */
-    @Test
     protected PrivateKey testPrivKey(String keyFile, char[] password, String algo) throws Exception {
         InputStream keyInS = SecurityHelperTest.class.getResourceAsStream(keyFile);
 

Modified: trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/XMLSecurityHelperTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/XMLSecurityHelperTest.java?rev=3029&r1=3028&r2=3029&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/XMLSecurityHelperTest.java (original)
+++ trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/XMLSecurityHelperTest.java Mon Apr  9 22:09:56 2012
@@ -17,42 +17,17 @@
 
 package org.opensaml.xmlsec;
 
-import org.testng.annotations.Test;
-import org.testng.Assert;
-import java.io.InputStream;
-import java.security.PrivateKey;
-
 import org.opensaml.security.SecurityHelper;
-import org.opensaml.xmlsec.XMLSecurityHelper;
 import org.opensaml.xmlsec.encryption.support.EncryptionConstants;
 import org.opensaml.xmlsec.signature.support.SignatureConstants;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
 /**
  * Unit test for {@link SecurityHelper}.
  */
 public class XMLSecurityHelperTest {
 
-    /** Location of non-encrypted, PEM formatted, RSA private key. */
-    private String rsaPrivKeyPEMNoEncrypt = "/data/rsa-privkey-nopass.pem";
-
-    /** Location of non-encrypted, DER formatted, RSA private key. */
-    private String rsaPrivKeyDERNoEncrypt = "/data/rsa-privkey-nopass.der";
-    
-    /** Location of non-encrypted, PEM formatted, dSA private key. */
-    private String dsaPrivKeyPEMNoEncrypt = "/data/dsa-privkey-nopass.pem";
-
-    /** Location of non-encrypted, DER formatted, dSA private key. */
-    private String dsaPrivKeyDERNoEncrypt = "/data/dsa-privkey-nopass.der";
-
-    /** Password for private key. */
-    private char[] privKeyPassword = { 'c', 'h', 'a', 'n', 'g', 'e', 'i', 't' };
-
-    /** Location of encrypted, PEM formatted, RSA private key. */
-    private String rsaPrivKeyPEMEncrypt = "/data/rsa-privkey-changeit-pass.pem";
-
-    /** Location of encrypted, PEM formatted, DSA private key. */
-    private String dsaPrivKeyPEMEncrypt = "/data/dsa-privkey-changeit-pass.pem";
-    
     /** Test mapping algorithm URI's to JCA key algorithm specifiers. */
     @Test
     public void testKeyAlgorithmURIMappings() {
@@ -89,21 +64,5 @@
         Assert.assertNull(XMLSecurityHelper.getKeyAlgorithmFromURI(SignatureConstants.ALGO_ID_MAC_HMAC_NOT_RECOMMENDED_MD5));
         Assert.assertNull(XMLSecurityHelper.getKeyAlgorithmFromURI(SignatureConstants.ALGO_ID_MAC_HMAC_RIPEMD160));
     }    
-    
-    
 
-
-    /** Generic key testing. */
-    protected PrivateKey testPrivKey(String keyFile, char[] password, String algo) throws Exception {
-        InputStream keyInS = XMLSecurityHelperTest.class.getResourceAsStream(keyFile);
-
-        byte[] keyBytes = new byte[keyInS.available()];
-        keyInS.read(keyBytes);
-
-        PrivateKey key = SecurityHelper.decodePrivateKey(keyBytes, password);
-        Assert.assertNotNull(key);
-        Assert.assertEquals(key.getAlgorithm(), algo);
-        
-        return key;
-    }
 }