commit 87c2b15d398fccf4f9d3ab49bc3e0b3e8a99759d
author Oscar Montemayor <oam@google.com> Wed Feb 10 16:33:01 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 10 16:33:01 2010 -0800
tree 95010b6fda805116cd12d52175086df4b3133956
parent 575c6710a38f608aca2c25e7784674a47d18a871
parent 64ef1ce9368985932f4cc7a06b3af585394c5cc6

Merge "Fix for bug 2427961	android.security.tests.SystemKeyStoreTest:testBasicAccess is failing. Fixed issues in test."

keystore/tests/src/android/security/SystemKeyStoreTest.java

diff --git a/keystore/tests/src/android/security/SystemKeyStoreTest.java b/keystore/tests/src/android/security/SystemKeyStoreTest.java
index a9e2687..a4d744b 100644
--- a/keystore/tests/src/android/security/SystemKeyStoreTest.java
+++ b/keystore/tests/src/android/security/SystemKeyStoreTest.java
@@ -60,7 +60,7 @@
 
     public void testBasicAccess() throws Exception {
         try {
-            byte[] newKey = mSysKeyStore.generateNewKey(128, "Blowfish", keyName);
+            byte[] newKey = mSysKeyStore.generateNewKey(128, "AES", keyName);
             assertNotNull(newKey);
             byte[] recKey = mSysKeyStore.retrieveKey(keyName);
             assertEquals(newKey.length, recKey.length);
@@ -75,8 +75,9 @@
             assertNotNull(newKeyStr);
             String recKeyStr = mSysKeyStore.retrieveKeyHexString(keyName2);
             assertEquals(newKeyStr, recKeyStr);
+
             mSysKeyStore.deleteKey(keyName2);
-            String nullKey2 = mSysKeyStore.retrieveKeyHexString(keyName);
+            String nullKey2 = mSysKeyStore.retrieveKeyHexString(keyName2);
             assertNull(nullKey2);
         } catch (Exception e) {
             fail();