commit cf8dab6d84729b567b9f373e8f5dec5a4f46b0b3
author Brian Carlstrom <bdc@google.com> Tue Jun 07 13:46:33 2011 -0700
committer Brian Carlstrom <bdc@google.com> Tue Jun 07 15:58:28 2011 -0700
tree 54cbae65692b56f38b0fabba9ce45af4fdd3e3a5
parent 9e606dfda36c1a23f36724b7d45f97d2942573ee

Change KeyChain tests to use PEM format in keystore to match CertInstaller

Change-Id: I2900526376dafca2dabc9beec300e80add2a14a3

tests/src/com/android/keychain/tests/KeyChainServiceTest.java

diff --git a/tests/src/com/android/keychain/tests/KeyChainServiceTest.java b/tests/src/com/android/keychain/tests/KeyChainServiceTest.java
index 9da9834..cb4ba16 100644
--- a/tests/src/com/android/keychain/tests/KeyChainServiceTest.java
+++ b/tests/src/com/android/keychain/tests/KeyChainServiceTest.java
@@ -177,14 +177,22 @@
             Certificate intermediate2 = pke2.getCertificateChain()[1];
             Certificate root2 = TestKeyStore.getServer().getRootCertificate("RSA");
 
-            assertTrue(mSupport.keystorePut(alias1Pkey, pke1.getPrivateKey().getEncoded()));
-            assertTrue(mSupport.keystorePut(alias1Cert, pke1.getCertificate().getEncoded()));
-            assertTrue(mSupport.keystorePut(alias1ICert, intermediate1.getEncoded()));
-            assertTrue(mSupport.keystorePut(alias1RCert, root1.getEncoded()));
-            assertTrue(mSupport.keystorePut(alias2Pkey, pke2.getPrivateKey().getEncoded()));
-            assertTrue(mSupport.keystorePut(alias2Cert, pke2.getCertificate().getEncoded()));
-            assertTrue(mSupport.keystorePut(alias2ICert, intermediate2.getEncoded()));
-            assertTrue(mSupport.keystorePut(alias2RCert, root2.getEncoded()));
+            assertTrue(mSupport.keystorePut(alias1Pkey,
+                                            Credentials.convertToPem(pke1.getPrivateKey())));
+            assertTrue(mSupport.keystorePut(alias1Cert,
+                                            Credentials.convertToPem(pke1.getCertificate())));
+            assertTrue(mSupport.keystorePut(alias1ICert,
+                                            Credentials.convertToPem(intermediate1)));
+            assertTrue(mSupport.keystorePut(alias1RCert,
+                                            Credentials.convertToPem(root1)));
+            assertTrue(mSupport.keystorePut(alias2Pkey,
+                                            Credentials.convertToPem(pke2.getPrivateKey())));
+            assertTrue(mSupport.keystorePut(alias2Cert,
+                                            Credentials.convertToPem(pke2.getCertificate())));
+            assertTrue(mSupport.keystorePut(alias2ICert,
+                                            Credentials.convertToPem(intermediate2)));
+            assertTrue(mSupport.keystorePut(alias2RCert,
+                                            Credentials.convertToPem(root2)));
 
             assertEquals(KeyStore.State.UNLOCKED, keyStore.state());
             AccountManager accountManager = AccountManager.get(KeyChainServiceTest.this);
@@ -239,12 +247,12 @@
             Log.d(TAG, "test_KeyChainService positive testing");
             byte[] privateKey = mService.getPrivateKey(alias1, authToken);
             assertNotNull(privateKey);
-            assertEquals(Arrays.toString(pke1.getPrivateKey().getEncoded()),
+            assertEquals(Arrays.toString(Credentials.convertToPem(pke1.getPrivateKey())),
                          Arrays.toString(privateKey));
 
             byte[] certificate = mService.getCertificate(alias1, authToken);
             assertNotNull(certificate);
-            assertEquals(Arrays.toString(pke1.getCertificate().getEncoded()),
+            assertEquals(Arrays.toString(Credentials.convertToPem(pke1.getCertificate())),
                          Arrays.toString(certificate));
 
             Log.d(TAG, "test_KeyChainService negative testing");

tests/src/com/android/keychain/tests/KeyChainTestActivity.java

diff --git a/tests/src/com/android/keychain/tests/KeyChainTestActivity.java b/tests/src/com/android/keychain/tests/KeyChainTestActivity.java
index a3b87be..60555f1 100644
--- a/tests/src/com/android/keychain/tests/KeyChainTestActivity.java
+++ b/tests/src/com/android/keychain/tests/KeyChainTestActivity.java
@@ -140,7 +140,7 @@
             X509Certificate ca = TestKeyStore.getServer().getRootCertificate("RSA");
             Intent intent = new Intent("android.credentials.INSTALL");
             intent.putExtra("name", TAG); // "name" = CredentialHelper.CERT_NAME_KEY
-            intent.putExtra(Credentials.CERTIFICATE, ca.getEncoded());
+            intent.putExtra(Credentials.CERTIFICATE, Credentials.convertToPem(ca));
             startActivityForResult(intent, REQUEST_CA_INSTALL);
         } catch (Exception e) {
             throw new AssertionError(e);