[java-opensaml COMMIT] /trunk/opensaml-security-api/src/test/java/org/opensaml/security/crypto/KeySupportTest.java

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Mar 19 16:04:53 2014
New Revision: 3714

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3714&view=rev
Log:
Fix KeySupport getKeyLength() tests to not fail if EC is unsupported by the JRE.
Make tests more efficient (and more correct) by evaling the public and private key from the same KeyPair, instead of regenerating a new one every time.

Modified:
    trunk/opensaml-security-api/src/test/java/org/opensaml/security/crypto/KeySupportTest.java

Modified: trunk/opensaml-security-api/src/test/java/org/opensaml/security/crypto/KeySupportTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-api/src/test/java/org/opensaml/security/crypto/KeySupportTest.java?rev=3714&r1=3713&r2=3714&view=diff
==============================================================================
--- trunk/opensaml-security-api/src/test/java/org/opensaml/security/crypto/KeySupportTest.java (original)
+++ trunk/opensaml-security-api/src/test/java/org/opensaml/security/crypto/KeySupportTest.java Wed Mar 19 16:04:53 2014
@@ -155,29 +155,55 @@
     
     @Test
     public void testKeyLength() throws NoSuchAlgorithmException, NoSuchProviderException {
-        Assert.assertEquals(KeySupport.getKeyLength(KeySupport.generateKeyPair("RSA", 1024, null).getPublic()), new Integer(1024));
-        Assert.assertEquals(KeySupport.getKeyLength(KeySupport.generateKeyPair("RSA", 1024, null).getPrivate()), new Integer(1024));
-        Assert.assertEquals(KeySupport.getKeyLength(KeySupport.generateKeyPair("RSA", 2048, null).getPublic()), new Integer(2048));
-        Assert.assertEquals(KeySupport.getKeyLength(KeySupport.generateKeyPair("RSA", 2048, null).getPrivate()), new Integer(2048));
-        Assert.assertEquals(KeySupport.getKeyLength(KeySupport.generateKeyPair("RSA", 4096, null).getPublic()), new Integer(4096));
-        Assert.assertEquals(KeySupport.getKeyLength(KeySupport.generateKeyPair("RSA", 4096, null).getPrivate()), new Integer(4096));
-        
-        Assert.assertEquals(KeySupport.getKeyLength(KeySupport.generateKeyPair("DSA", 512, null).getPublic()), new Integer(512));
-        Assert.assertEquals(KeySupport.getKeyLength(KeySupport.generateKeyPair("DSA", 512, null).getPrivate()), new Integer(512));
-        Assert.assertEquals(KeySupport.getKeyLength(KeySupport.generateKeyPair("DSA", 1024, null).getPublic()), new Integer(1024));
-        Assert.assertEquals(KeySupport.getKeyLength(KeySupport.generateKeyPair("DSA", 1024, null).getPrivate()), new Integer(1024));
-        
-        /*
-        Assert.assertEquals(KeySupport.getKeyLength(KeySupport.generateKeyPair("EC", 112, null).getPublic()), new Integer(112));
-        Assert.assertEquals(KeySupport.getKeyLength(KeySupport.generateKeyPair("EC", 112, null).getPrivate()), new Integer(112));
-        Assert.assertEquals(KeySupport.getKeyLength(KeySupport.generateKeyPair("EC", 571, null).getPublic()), new Integer(571));
-        Assert.assertEquals(KeySupport.getKeyLength(KeySupport.generateKeyPair("EC", 571, null).getPrivate()), new Integer(571));
-        */
-        
+        KeyPair kp = null;
+        
+        // Asymmetric: RSA
+        kp = KeySupport.generateKeyPair("RSA", 1024, null);
+        Assert.assertEquals(KeySupport.getKeyLength(kp.getPublic()), new Integer(1024));
+        Assert.assertEquals(KeySupport.getKeyLength(kp.getPrivate()), new Integer(1024));
+        
+        kp = KeySupport.generateKeyPair("RSA", 2048, null);
+        Assert.assertEquals(KeySupport.getKeyLength(kp.getPublic()), new Integer(2048));
+        Assert.assertEquals(KeySupport.getKeyLength(kp.getPrivate()), new Integer(2048));
+        
+        kp = KeySupport.generateKeyPair("RSA", 4096, null);
+        Assert.assertEquals(KeySupport.getKeyLength(kp.getPublic()), new Integer(4096));
+        Assert.assertEquals(KeySupport.getKeyLength(kp.getPrivate()), new Integer(4096));
+        
+        // Asymmetric: DSA
+        kp = KeySupport.generateKeyPair("DSA", 512, null);
+        Assert.assertEquals(KeySupport.getKeyLength(kp.getPublic()), new Integer(512));
+        Assert.assertEquals(KeySupport.getKeyLength(kp.getPrivate()), new Integer(512));
+        
+        kp = KeySupport.generateKeyPair("DSA", 1024, null);
+        Assert.assertEquals(KeySupport.getKeyLength(kp.getPublic()), new Integer(1024));
+        Assert.assertEquals(KeySupport.getKeyLength(kp.getPrivate()), new Integer(1024));
+        
+        // Asymmetric: EC
+        try {
+            kp = KeySupport.generateKeyPair("EC", 112, null);
+            Assert.assertEquals(KeySupport.getKeyLength(kp.getPublic()), new Integer(112));
+            Assert.assertEquals(KeySupport.getKeyLength(kp.getPrivate()), new Integer(112));
+        
+            kp = KeySupport.generateKeyPair("EC", 256, null);
+            Assert.assertEquals(KeySupport.getKeyLength(kp.getPublic()), new Integer(256));
+            Assert.assertEquals(KeySupport.getKeyLength(kp.getPrivate()), new Integer(256));
+        
+            kp = KeySupport.generateKeyPair("EC", 571, null);

[... 18 lines stripped ...]