From eb136919189d45fbc703768a596f160a7b6e6171 Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Sat, 30 Nov 2013 18:34:57 -0500
Subject: [PATCH] Eliminate the need for reflection to access hidden API

---
 tests/assets/cert1.der                        | Bin 525 -> 0 bytes
 tests/assets/cert2.der                        | Bin 525 -> 0 bytes
 .../mail/store/TrustManagerFactoryTest.java   |  53 +++++++++++++-----
 3 files changed, 40 insertions(+), 13 deletions(-)
 delete mode 100644 tests/assets/cert1.der
 delete mode 100644 tests/assets/cert2.der

diff --git a/tests/assets/cert1.der b/tests/assets/cert1.der
deleted file mode 100644
index cdfe84df76c6d6ba28f6b20eaf02109c62b6296f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 525
zcmXqLV&XJtVk~0fWccsya`o+9rl$tHY@Awc9&O)w85vnw84NrPxeYkkm_u3EgqfT@
z422B@K^zWYuHgLKRNdf`#FA7)9s@3rAeS(+x2~n3xPd5$$1Kd3ZK;=9k(gVMld6}T
zpKBl|&TD9BU}<1xXlZJ0Y#JrbYXssNL%Gzns&PKDKNwjVm>YW;3>rI`8XFl_zKK5W
zx<tyNdwaJ+rGza1mJb_Ge>*)z#xeg?t<zzpnYA;{m-P0ghMe{DZQ=@_mEN{!(t&y3
zQd`r6j{9^-=J2!ksYtAg%WSw9x%!{>)9a0wozyhG1}0yc5hK~^#hbTnVNsuhIIl8y
z)S}-754SI~dQ^V)tnm!rlUwcWbXQh1@G>zoGB6@L4;akMKzB92X}mXoM@UAmazmld
z!mOrQ$uq)L|I5CWJ&>3a!|+XQ{tD~6GuQn5_n)KI=-*|VYYoBE)<^2@I(cHxp?4p*
zE?e4eaINcIMnhZgHbv<rKWg;#7dPyv{dhOGeny>4cix_Y#?V>qC-^;Y=vwt15xH~r
Wo1*frEg_=ftN!0ke|tOR$U*>OZo6dw

diff --git a/tests/assets/cert2.der b/tests/assets/cert2.der
deleted file mode 100644
index aecc3459dbb976895eb9d77320580d9eb7796df9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 525
zcmXqLV&XJtVk~0fWH_^4Yt<#Tno9<}Y@Awc9&O)w85vnw84NrPxeYkkm_u3EgqfT@
z422B@K^zWYuHgLKRNdf`#FA7)9s@3rAeS(+x2~n3xPd5$$1Kd3ZK;=9k(gVMld6}T
zpKBl|&TD9BU}<1xWME)mY8oZZYXssNL%Gzns&PKDKNwjVm>YW;3>rI`8XFnT>6_#g
z=)T=q^xy18x|E0T+{iC?w=G@wjei0|{=SWS?pS3$)AHc{(Z7-V!?ItSmMXii+L<9B
z_u^jLg-<so@?AT(;fi&`qPnDpuVov~a)p*Gk$(Ly`(gucLxEKRr_rf{K}K4McI$HA
zPd_kC^uE)IatY^RnJY`LXC1EKaWGE*&F;>`%*eoq>^xvFGXvcfa7QL8E&a-rwP(e$
zwN9CO1!WXnl)k5Trl%y-ncL;LxPa@FO)Uji#b0<x%A8JV>5*e%`o8hi0wqh^ce&Nw
zKg3wG{=W-8<R3XdW3Ph53bEQurwr)@W^Er#r_Db9eb<CP7o#M3|HLiXG;!Lpbe4^G
XentkIfAm#9{eQ9iuBX>lT{;8+QGmGO

diff --git a/tests/src/com/fsck/k9/mail/store/TrustManagerFactoryTest.java b/tests/src/com/fsck/k9/mail/store/TrustManagerFactoryTest.java
index ba2511bc2..4a105f51d 100644
--- a/tests/src/com/fsck/k9/mail/store/TrustManagerFactoryTest.java
+++ b/tests/src/com/fsck/k9/mail/store/TrustManagerFactoryTest.java
@@ -2,8 +2,9 @@ package com.fsck.k9.mail.store;
 
 import javax.net.ssl.X509TrustManager;
 import com.fsck.k9.K9;
+
+import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.lang.reflect.Method;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
@@ -11,7 +12,6 @@ import java.util.concurrent.CountDownLatch;
 
 import android.app.Application;
 import android.content.Context;
-import android.content.res.AssetManager;
 import android.test.AndroidTestCase;
 
 /**
@@ -23,12 +23,49 @@ public class TrustManagerFactoryTest extends AndroidTestCase {
     public static final int PORT1 = 993;
     public static final int PORT2 = 465;
 
+    private static final String K9_EXAMPLE_COM_CERT1 =
+              "-----BEGIN CERTIFICATE-----\n"
+            + "MIICCTCCAXICCQD/R0TV7d0C5TANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJD\n"
+            + "SDETMBEGA1UECBMKU29tZS1TdGF0ZTEMMAoGA1UEChMDSy05MRcwFQYDVQQDEw5r\n"
+            + "OS5leGFtcGxlLmNvbTAeFw0xMTA5MDYxOTU3MzVaFw0yMTA5MDMxOTU3MzVaMEkx\n"
+            + "CzAJBgNVBAYTAkNIMRMwEQYDVQQIEwpTb21lLVN0YXRlMQwwCgYDVQQKEwNLLTkx\n"
+            + "FzAVBgNVBAMTDms5LmV4YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB\n"
+            + "iQKBgQCp7FvHRaQaOIu3iyB5GB0PtPCxy/bLlBxBb8p9QsMimX2Yz3SNjWVUzU5N\n"
+            + "ggpXmmeGopLAnvZlhWYSx0yIGWwPB44kGK5eaYDRWav+K+XXgdNCJij1UWPSmFwZ\n"
+            + "hUoNbrahco5AFw0jC1qi+3Dht6Y64nfNzTOYTcm1Pz4tqXiADQIDAQABMA0GCSqG\n"
+            + "SIb3DQEBBQUAA4GBAIPsgd6fuFRojSOAcUyhaoKaY5hXJf8d7R3AYWxcAPYmn6g7\n"
+            + "3Zms+f7/CH0y/tM81oBTlq9ZLbrJyLzC7vG1pqWHMNaK7miAho22IRuk+HwvL6OA\n"
+            + "uH3x3W1/mH4ci268cIFVmofID0nYLTqOxBTczfYhI7q0VBUXqv/bZ+3bVMSh\n"
+            + "-----END CERTIFICATE-----\n";
+
+    private static final String K9_EXAMPLE_COM_CERT2 =
+              "-----BEGIN CERTIFICATE-----\n"
+            + "MIICCTCCAXICCQDMryqq0gZ80jANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJD\n"
+            + "SDETMBEGA1UECBMKU29tZS1TdGF0ZTEMMAoGA1UEChMDSy05MRcwFQYDVQQDEw5r\n"
+            + "OS5leGFtcGxlLmNvbTAeFw0xMTA5MDYyMDAwNTVaFw0yMTA5MDMyMDAwNTVaMEkx\n"
+            + "CzAJBgNVBAYTAkNIMRMwEQYDVQQIEwpTb21lLVN0YXRlMQwwCgYDVQQKEwNLLTkx\n"
+            + "FzAVBgNVBAMTDms5LmV4YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB\n"
+            + "iQKBgQDOLzRucC3tuXL/NthnGkgTnVn03balrvYPkABvvrG83Dpp5ipIC/iPsQvw\n"
+            + "pvqypSNHqrloEB7o3obQ8tiRDtbOsNQ7gKJ+YoD1drDNClV0pBvr7mvRgA2AcDpw\n"
+            + "CTLKwVIyKmE+rm3vl8CWFd9CqHcYQ3Mc1KXXasN4DEAzZ/sHRwIDAQABMA0GCSqG\n"
+            + "SIb3DQEBBQUAA4GBAFDcHFpmZ9SUrc0WayrKNUpSaHLRG94uzIx0VUMLROcXEEWU\n"
+            + "soRw1RfoSBkcy2SEjB4CAvex6qAiOT3ubXuL+BYFav/uU8JPWZ9ovSAYqBZ9aUJo\n"
+            + "G6A2hvA1lpvP97qQ/NFaGQ38XqSykZamZwSx3PlZUM/i9S9n/3MfuuXWqtLC\n"
+            + "-----END CERTIFICATE-----\n";
+
 
-    private Context mTestContext;
     private X509Certificate mCert1;
     private X509Certificate mCert2;
 
 
+    public TrustManagerFactoryTest() throws CertificateException {
+        CertificateFactory certFactory = CertificateFactory.getInstance("X509");
+        mCert1 = (X509Certificate) certFactory.generateCertificate(
+                new ByteArrayInputStream(K9_EXAMPLE_COM_CERT1.getBytes()));
+        mCert2 = (X509Certificate) certFactory.generateCertificate(
+                new ByteArrayInputStream(K9_EXAMPLE_COM_CERT2.getBytes()));
+    }
+
     @Override
     public void setUp() throws Exception {
         waitForAppInitialization();
@@ -36,10 +73,6 @@ public class TrustManagerFactoryTest extends AndroidTestCase {
         // Hack to make sure TrustManagerFactory.loadKeyStore() can create the key store file
         K9.app = new DummyApplication(getContext());
 
-        // Source: https://kmansoft.wordpress.com/2011/04/18/accessing-resources-in-an-androidtestcase/
-        Method m = AndroidTestCase.class.getMethod("getTestContext", new Class[] {});
-        mTestContext = (Context) m.invoke(this, (Object[]) null);
-
         // Delete the key store file to make sure we start without any stored certificates
         File keyStoreDir = getContext().getDir("KeyStore", Context.MODE_PRIVATE);
         new File(keyStoreDir + File.separator + "KeyStore.bks").delete();
@@ -47,12 +80,6 @@ public class TrustManagerFactoryTest extends AndroidTestCase {
         // Load the empty key store file
         TrustManagerFactory.loadKeyStore();
 
-        // Load certificates
-        AssetManager assets = mTestContext.getAssets();
-
-        CertificateFactory certFactory = CertificateFactory.getInstance("X509");
-        mCert1 = (X509Certificate) certFactory.generateCertificate(assets.open("cert1.der"));
-        mCert2 = (X509Certificate) certFactory.generateCertificate(assets.open("cert2.der"));
     }
 
     private void waitForAppInitialization() throws InterruptedException {