From 8b58c52bf4cc276165b1857eb4087eabde7b6477 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Mon, 4 Feb 2013 14:47:23 -0800 Subject: AndroidKeyStore: fix tests Change-Id: I65fd8ba27af57ea8fd27c8e08c9c1201f32c494d --- keystore/java/android/security/KeyStore.java | 2 +- .../src/android/security/AndroidKeyStoreTest.java | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index 44be804..444dc1d 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -243,7 +243,7 @@ public class KeyStore { */ public long getmtime(String key) { try { - return mBinder.getmtime(key); + return mBinder.getmtime(key) * 1000L; } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); return -1L; diff --git a/keystore/tests/src/android/security/AndroidKeyStoreTest.java b/keystore/tests/src/android/security/AndroidKeyStoreTest.java index 49e2f12..056e681 100644 --- a/keystore/tests/src/android/security/AndroidKeyStoreTest.java +++ b/keystore/tests/src/android/security/AndroidKeyStoreTest.java @@ -577,17 +577,14 @@ public class AndroidKeyStoreTest extends AndroidTestCase { assertAliases(new String[] { }); } - public void testKeyStore_DeleteEntry_EmptyStore_Failure() throws Exception { + public void testKeyStore_DeleteEntry_EmptyStore_Success() throws Exception { mKeyStore.load(null, null); - try { - mKeyStore.deleteEntry(TEST_ALIAS_1); - fail("Should throw KeyStoreException with non-existent alias"); - } catch (KeyStoreException success) { - } + // Should not throw when a non-existent entry is requested for delete. + mKeyStore.deleteEntry(TEST_ALIAS_1); } - public void testKeyStore_DeleteEntry_NonExistent_Failure() throws Exception { + public void testKeyStore_DeleteEntry_NonExistent_Success() throws Exception { mKeyStore.load(null, null); // TEST_ALIAS_1 @@ -596,11 +593,8 @@ public class AndroidKeyStoreTest extends AndroidTestCase { assertTrue(mAndroidKeyStore.put(Credentials.USER_CERTIFICATE + TEST_ALIAS_1, FAKE_USER_1)); assertTrue(mAndroidKeyStore.put(Credentials.CA_CERTIFICATE + TEST_ALIAS_1, FAKE_CA_1)); - try { - mKeyStore.deleteEntry(TEST_ALIAS_2); - fail("Should throw KeyStoreException with non-existent alias"); - } catch (KeyStoreException success) { - } + // Should not throw when a non-existent entry is requested for delete. + mKeyStore.deleteEntry(TEST_ALIAS_2); } public void testKeyStore_GetCertificate_Single_Success() throws Exception { -- cgit v1.1