am 133c5f5e: Merge "AndroidKeyStore: fix tests" (516fab24) · Commits · e / os / android_frameworks_base

keystore/java/android/security/KeyStore.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

+6 −12

Original line number	Diff line number	Diff line
		@@ -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 {
		// Should not throw when a non-existent entry is requested for delete.
		mKeyStore.deleteEntry(TEST_ALIAS_1);
		fail("Should throw KeyStoreException with non-existent alias");
		} catch (KeyStoreException success) {
		}
		}

		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 {
		// Should not throw when a non-existent entry is requested for delete.
		mKeyStore.deleteEntry(TEST_ALIAS_2);
		fail("Should throw KeyStoreException with non-existent alias");
		} catch (KeyStoreException success) {
		}
		}

		public void testKeyStore_GetCertificate_Single_Success() throws Exception {