Fix KeyGeneratorTest breakage due to AndroidKeyStore.

AndroidKeyStore provider's KeyPairGenerator and KeyGenerator instances
require AndroidKeyStore-specific initialization parameters which are
represnted by Android framework classes and are thus not accessible
from libcore tests.

This CL fixes KeyGeneratorTest to skip AndroidKeyStore provider to
follow the behavior of KeyPairGeneratorTest.

Change-Id: I61d176a7bc22a676d06d32f49aba37aebebe9c76

2 files changed, 13 insertions, 1 deletions

diff --git a/luni/src/test/java/libcore/java/security/KeyPairGeneratorTest.java b/luni/src/test/java/libcore/java/security/KeyPairGeneratorTest.java
index e7fdb1f..7e08b5f 100644
--- a/luni/src/test/java/libcore/java/security/KeyPairGeneratorTest.java
+++ b/luni/src/test/java/libcore/java/security/KeyPairGeneratorTest.java
@@ -121,7 +121,10 @@ public class KeyPairGeneratorTest extends TestCase {
             }
             String algorithm = service.getAlgorithm();
 
-            // AndroidKeyStore is tested in CTS.
+            // Do not test AndroidKeyStore's KeyPairGenerator. It cannot be initialized without
+            // providing AndroidKeyStore-specific algorithm parameters.
+            // It's OKish not to test AndroidKeyStore's KeyPairGenerator here because it's tested
+            // by cts/tests/test/keystore.
             if ("AndroidKeyStore".equals(provider.getName())) {
                 continue;
             }
diff --git a/luni/src/test/java/libcore/javax/crypto/KeyGeneratorTest.java b/luni/src/test/java/libcore/javax/crypto/KeyGeneratorTest.java
index 8bbd548..5763562 100644
--- a/luni/src/test/java/libcore/javax/crypto/KeyGeneratorTest.java
+++ b/luni/src/test/java/libcore/javax/crypto/KeyGeneratorTest.java
@@ -44,6 +44,15 @@ public class KeyGeneratorTest extends TestCase {
                 if (!type.equals("KeyGenerator")) {
                     continue;
                 }
+
+                // Do not test AndroidKeyStore's KeyGenerator. It cannot be initialized without
+                // providing AndroidKeyStore-specific algorithm parameters.
+                // It's OKish not to test AndroidKeyStore's KeyGenerator here because it's tested
+                // by cts/tests/test/keystore.
+                if ("AndroidKeyStore".equals(provider.getName())) {
+                    continue;
+                }
+
                 String algorithm = service.getAlgorithm();
                 try {
                     // KeyGenerator.getInstance(String)