From 1a1ece32b19ed543040ca3a6eb39dd12185c22b3 Mon Sep 17 00:00:00 2001
From: Edouard Tisserant <devnull@localhost>
Date: Wed, 2 Dec 2015 15:26:14 +0100
Subject: [PATCH] More tests, more fixes.

---
 .../main/java/com/pep/k9/MainActivity.java    | 37 ++++++++++---------
 src/org/pEp/jniadapter/AbstractEngine.java    |  6 ++-
 2 files changed, 25 insertions(+), 18 deletions(-)

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 94cdfdd..e97a957 100644
--- a/androidTests/app/src/main/java/com/pep/k9/MainActivity.java
+++ b/androidTests/app/src/main/java/com/pep/k9/MainActivity.java
@@ -48,8 +48,8 @@ public class MainActivity extends AppCompatActivity {
         //noinspection SimplifiableIfStatement
         if (id == R.id.action_settings) {
             try {
-                //testPEpAliceBobJohn();
-                testPEpTypes();
+                testPEpAliceBobJohn();
+                //testPEpTypes();
             }
             catch (Exception ex) {
                 Log.e("PEPTEST", "##################### TEST Exception ####################",ex);
@@ -426,34 +426,37 @@ public class MainActivity extends AppCompatActivity {
 
         Vector<Identity> to = new Vector<Identity>();
         to.add(bob);
-        to.add(john);
         msg.setTo(to);
 
+        Vector<Identity> cc = new Vector<Identity>();
+        cc.add(alice);
+        msg.setCc(cc);
+
+        Vector<Identity> bcc = new Vector<Identity>();
+        bcc.add(john);
+        msg.setBcc(bcc);
+
         msg.setShortmsg("hello, world");
         msg.setLongmsg("this is a test");
 
         msg.setDir(Message.Direction.Outgoing);
-        Log.d("PEPTEST", e.outgoing_message_color(msg).toString());
+        assert e.outgoing_message_color(msg).equals(Color.pEpRatingReliable);
 
         Message enc = null;
         enc = e.encrypt_message(msg, null);
 
-        if(enc != null) {
-            Log.d("PEPTEST", "encrypted OK");
-            Log.d("PEPTEST", enc.getLongmsg());
-            Vector<Blob> attachments = enc.getAttachments();
-            Log.d("PEPTEST", e.toUTF16(attachments.get(1).data));
+        assert enc != null;
 
-            Engine.decrypt_message_Return result = null;
-            result = e.decrypt_message(enc);
-            Log.d("PEPTEST", "decrypted");
+        assert enc.getShortmsg().equals("pEp");
+        assert enc.getLongmsg().contains("pep-project.org");
 
-            Log.d("PEPTEST", result.dst.getShortmsg());
-            Log.d("PEPTEST", result.dst.getLongmsg());
-        } else {
-            Log.d("PEPTEST", "NOT encrypted !!!");
+        Vector<Blob> attachments = enc.getAttachments();
+        assert e.toUTF16(attachments.get(1).data).startsWith("-----BEGIN PGP MESSAGE-----");
 
-        }
+        Engine.decrypt_message_Return result = null;
+        result = e.decrypt_message(enc);
+        assert result.dst.getShortmsg().equals("hello, world");
+        assert result.dst.getLongmsg().equals("this is a test");
 
     }
 
diff --git a/src/org/pEp/jniadapter/AbstractEngine.java b/src/org/pEp/jniadapter/AbstractEngine.java
index 0779f1d..7978cf7 100644
--- a/src/org/pEp/jniadapter/AbstractEngine.java
+++ b/src/org/pEp/jniadapter/AbstractEngine.java
@@ -39,7 +39,11 @@ abstract class AbstractEngine implements AutoCloseable {
 
         try {
             String _str = Normalizer.normalize(str, Normalizer.Form.NFC);
-            return _str.getBytes("UTF-8");
+            byte _buf[] = _str.getBytes("UTF-8");
+            // F*ck you, Java !
+            byte _cpy[] = new byte[_buf.length];
+            System.arraycopy(_buf,0,_cpy,0,_buf.length);
+            return _cpy;
         }
         catch (UnsupportedEncodingException e) {
             assert false;