From 9ea5717a2568291bd49b531b733dafbc99d1d5bb Mon Sep 17 00:00:00 2001 From: An Liu Date: Wed, 5 Feb 2014 16:06:48 -0800 Subject: Skip TimaKeyStore in KeyStoreTest TimaKeyStore is Samsung's TrustZone-based KeyStore service provider. It should be skipped for KeyStore test cases since Samsung has it's own test cases. (cherry picked from commit f0cd15d29ea97346b7c2e870969907cd586b1b30) Change-Id: I7c63dd1e037b0d8bed58593c2c9c883010106286 --- luni/src/test/java/libcore/java/security/KeyStoreTest.java | 3 ++- support/src/test/java/libcore/java/security/StandardNames.java | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/luni/src/test/java/libcore/java/security/KeyStoreTest.java b/luni/src/test/java/libcore/java/security/KeyStoreTest.java index ddee6ce..47aa72a 100644 --- a/luni/src/test/java/libcore/java/security/KeyStoreTest.java +++ b/luni/src/test/java/libcore/java/security/KeyStoreTest.java @@ -170,7 +170,8 @@ public class KeyStoreTest extends TestCase { // Don't bother testing BC on RI // TODO enable AndroidKeyStore when CTS can set up the keystore return (StandardNames.IS_RI && ks.getProvider().getName().equals("BC")) - || "AndroidKeyStore".equalsIgnoreCase(ks.getType()); + || "AndroidKeyStore".equalsIgnoreCase(ks.getType()) + || "TimaKeyStore".equalsIgnoreCase(ks.getType()); } private static boolean isNullPasswordAllowed(KeyStore ks) { diff --git a/support/src/test/java/libcore/java/security/StandardNames.java b/support/src/test/java/libcore/java/security/StandardNames.java index 78e9ae8..42ddcfa 100644 --- a/support/src/test/java/libcore/java/security/StandardNames.java +++ b/support/src/test/java/libcore/java/security/StandardNames.java @@ -504,6 +504,12 @@ public final class StandardNames extends Assert { if (Security.getProvider("AndroidKeyStore") != null) { provide("KeyStore", "AndroidKeyStore"); } + + // TimaKeyStore provider + if (Security.getProvider("TimaKeyStore") != null) { + provide("KeyStore", "TimaKeyStore"); + } + } } -- cgit v1.1