Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AndroidKeyStore: fix tests"

Browse Source
This commit is contained in:
Kenny Root
2013-02-04 23:01:01 +00:00
committed by Gerrit Code Review
parent ace72f6a37 8b58c52bf4
commit 133c5f5e91
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keystore/java/android/security/KeyStore.java
View File

@@ -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;

18
keystore/tests/src/android/security/AndroidKeyStoreTest.java
View File

@@ -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 {