From 20b6b1787673527884587923348118cbbcc7a31d Mon Sep 17 00:00:00 2001
From: Edouard Tisserant <devnull@localhost>
Date: Tue, 8 Dec 2015 00:50:22 +0100
Subject: [PATCH] AndroidTest : Added Keyserver Lookup Test. Fixed missing
 perms and gpg2key binary

---
 .../src/org/pEp/jniadapter/AndroidHelper.java |  1 +
 androidTests/app/src/main/AndroidManifest.xml |  2 +
 .../main/java/com/pep/k9/MainActivity.java    | 41 +++++++++++++++----
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/android/src/org/pEp/jniadapter/AndroidHelper.java b/android/src/org/pEp/jniadapter/AndroidHelper.java
index a84bc8c..03f867d 100644
--- a/android/src/org/pEp/jniadapter/AndroidHelper.java
+++ b/android/src/org/pEp/jniadapter/AndroidHelper.java
@@ -117,6 +117,7 @@ public class AndroidHelper {
             optDir.mkdirs();
             assetPathExtract(c, "lib", optDir);
             assetPathExtract(c, "bin", optDir);
+            assetPathExtract(c, "libexec", optDir);
             new File(optDir, "var/cache/gnupg").mkdirs();
             new File(optDir, "var/lib/gnupg").mkdirs();
             new File(optDir, "var/run/gnupg").mkdirs();
diff --git a/androidTests/app/src/main/AndroidManifest.xml b/androidTests/app/src/main/AndroidManifest.xml
index 3f4dcdb..f82184d 100644
--- a/androidTests/app/src/main/AndroidManifest.xml
+++ b/androidTests/app/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.pep.k9" >
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/androidTests/app/src/main/java/com/pep/k9/MainActivity.java b/androidTests/app/src/main/java/com/pep/k9/MainActivity.java
index f2706bc..9f9976e 100644
--- a/androidTests/app/src/main/java/com/pep/k9/MainActivity.java
+++ b/androidTests/app/src/main/java/com/pep/k9/MainActivity.java
@@ -41,9 +41,6 @@ public class MainActivity extends AppCompatActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle action b§§ar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
         int id = item.getItemId();
 
         //noinspection SimplifiableIfStatement
@@ -51,6 +48,7 @@ public class MainActivity extends AppCompatActivity {
             try {
                 testPEpTypes();
                 testPEpAliceBobJohn();
+                testKeyserverLookup();
             }
             catch (Exception ex) {
                 Log.e("PEPTEST", "##################### TEST Exception ####################",ex);
@@ -95,11 +93,6 @@ public class MainActivity extends AppCompatActivity {
 
         // TEST : Call getter before call to getter
 
-        // BUG : if not already instantiated, enum cannot be mapped
-        //       then getDir and getEncFormat return null.
-        // Message.Direction _bug1 = Message.Direction.Incoming;
-        // Message.EncFormat _bug2 = Message.EncFormat.None;
-
         if(!(msg.getDir() == Message.Direction.Incoming)) throw new AssertionError();
         if(!(msg.getId()==null)) throw new AssertionError();
         if(!(msg.getLongmsg()==null)) throw new AssertionError();
@@ -549,4 +542,36 @@ public class MainActivity extends AppCompatActivity {
         }
         e.close();
     }
+
+    public void testKeyserverLookup() throws pEpException, IOException, AssertionError, InterruptedException {
+
+        Engine e;
+
+        Log.d("PEPTEST", "Test loaded");
+
+        e = new Engine();
+
+        e.startKeyserverLookup();
+
+        Identity vb = new Identity();
+        vb.username = "pEpDontAssert";
+        vb.address = "vb@ulm.ccc.de";
+        vb.user_id = "SsI6H9";
+        e.updateIdentity(vb);
+
+        int count = 0;
+        while (count++ < 5000) {
+            Thread.sleep(1);
+        }
+
+        String fpr = e.updateIdentity(vb).fpr;
+
+        Log.d("PEPTEST", "keyserver test fpr");
+        Log.d("PEPTEST", fpr != null ? fpr : "NULL");
+        if(!(fpr != null)) throw new AssertionError();
+
+        e.stopKeyserverLookup();
+
+        e.close();
+    }
 }