From 2c390d1652260d7833c78a10874edfa30fcc1a51 Mon Sep 17 00:00:00 2001 From: heck Date: Wed, 10 Mar 2021 21:11:42 +0100 Subject: [PATCH] AdapterBaseTestContext: Add AttachmentList and change naming of default ctx messages. --- .../pEp/jniadapter/test/basic/TestMain.java | 11 ++++--- .../pEp/jniadapter/test/jni100/TestMain.java | 2 +- .../pEp/jniadapter/test/jni111/TestAlice.java | 10 +++---- .../pEp/jniadapter/test/jni114/TestAlice.java | 9 +++--- .../pEp/jniadapter/test/jni118/TestAlice.java | 5 ++-- .../pEp/jniadapter/test/jni98/TestMain.java | 4 +-- .../jniadapter/test/regression/TestMain.java | 18 ++++++------ .../test/utils/AdapterBaseTestContext.java | 25 +++++++++------- .../jniadapter/test/utils/AttachmentList.java | 29 +++++++++++++++++++ 9 files changed, 71 insertions(+), 42 deletions(-) create mode 100644 test/java/foundation/pEp/jniadapter/test/utils/AttachmentList.java diff --git a/test/java/foundation/pEp/jniadapter/test/basic/TestMain.java b/test/java/foundation/pEp/jniadapter/test/basic/TestMain.java index e763158..162c81f 100644 --- a/test/java/foundation/pEp/jniadapter/test/basic/TestMain.java +++ b/test/java/foundation/pEp/jniadapter/test/basic/TestMain.java @@ -1,6 +1,5 @@ package foundation.pEp.jniadapter.test.basic; -import foundation.pEp.jniadapter.Blob; import foundation.pEp.jniadapter.Identity; import foundation.pEp.jniadapter.Message; import foundation.pEp.jniadapter.decrypt_message_Return; @@ -49,21 +48,21 @@ class TestMain { }); new TestUnit("setAttachments", btc, ctx -> { - log("Adding " + ctx.attachmentsLen + " attachments"); - ctx.msgToBob.setAttachments(ctx.attachments); + log("Adding " + ctx.attachmentList.getCount() + " attachments"); + ctx.msgAliceToBob.setAttachments(ctx.attachmentList.getAttachments()); }); new TestUnit("Encrypt", btc, ctx -> { - ctx.enc = ctx.engine.encrypt_message(ctx.msgToBob, null, Message.EncFormat.PEP); + ctx.enc = ctx.engine.encrypt_message(ctx.msgAliceToBob, null, Message.EncFormat.PEP); log(AdapterTestUtils.msgToString(ctx.enc, false)); }); new TestUnit("Rating Preview", btc, ctx -> { - log("Rating preview: " + ctx.engine.outgoing_message_rating_preview(ctx.msgToBob)); + log("Rating preview: " + ctx.engine.outgoing_message_rating_preview(ctx.msgAliceToBob)); }); new TestUnit("Rating", btc, ctx -> { - log("Rating" + ctx.engine.outgoing_message_rating(ctx.msgToBob)); + log("Rating" + ctx.engine.outgoing_message_rating(ctx.msgAliceToBob)); }); new TestUnit("Decrypt", btc, ctx -> { diff --git a/test/java/foundation/pEp/jniadapter/test/jni100/TestMain.java b/test/java/foundation/pEp/jniadapter/test/jni100/TestMain.java index 28e4df0..030a771 100644 --- a/test/java/foundation/pEp/jniadapter/test/jni100/TestMain.java +++ b/test/java/foundation/pEp/jniadapter/test/jni100/TestMain.java @@ -17,7 +17,7 @@ class TestMain { ctx.alice = ctx.engine.myself(ctx.alice); TestLogger.log(AdapterTestUtils.identityToString(ctx.alice, true)); - Message msg1 = ctx.engine.encrypt_message(ctx.msgToBob, new Vector(), Message.EncFormat.PEP); + Message msg1 = ctx.engine.encrypt_message(ctx.msgAliceToBob, new Vector(), Message.EncFormat.PEP); ctx.engine.key_reset_all_own_keys(); diff --git a/test/java/foundation/pEp/jniadapter/test/jni111/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/jni111/TestAlice.java index d5dea18..2588c70 100644 --- a/test/java/foundation/pEp/jniadapter/test/jni111/TestAlice.java +++ b/test/java/foundation/pEp/jniadapter/test/jni111/TestAlice.java @@ -53,7 +53,7 @@ class TestAlice { new TestUnit("encrypt_message() -> pEpPassphraseRequired ", jni111Ctx, ctx -> { try { - Message enc = ctx.engine.encrypt_message(ctx.msgToSelf, new Vector<>(), Message.EncFormat.PEP); + Message enc = ctx.engine.encrypt_message(ctx.msgAliceToAlice, new Vector<>(), Message.EncFormat.PEP); } catch (pEpException e) { assert e instanceof pEpPassphraseRequired: "wrong exception type"; return; @@ -67,7 +67,7 @@ class TestAlice { new TestUnit("encrypt_message() -> pEpWrongPassphrase ", jni111Ctx, ctx -> { try { - Message enc = ctx.engine.encrypt_message(ctx.msgToSelf, new Vector<>(), Message.EncFormat.PEP); + Message enc = ctx.engine.encrypt_message(ctx.msgAliceToAlice, new Vector<>(), Message.EncFormat.PEP); } catch (pEpException e) { assert e instanceof pEpWrongPassphrase: "wrong exception type"; return; @@ -80,10 +80,10 @@ class TestAlice { }); new TestUnit("encrypt_message() -> success", jni111Ctx, ctx -> { - assert ctx.msgToSelf.getEncFormat() == Message.EncFormat.None : "Orig msg not plain"; - Message enc = ctx.engine.encrypt_message(ctx.msgToSelf, new Vector<>(), Message.EncFormat.PEP); + assert ctx.msgAliceToAlice.getEncFormat() == Message.EncFormat.None : "Orig msg not plain"; + Message enc = ctx.engine.encrypt_message(ctx.msgAliceToAlice, new Vector<>(), Message.EncFormat.PEP); assert enc.getEncFormat() == Message.EncFormat.PGPMIME :"Message not encrypted"; - assert !enc.getLongmsg().contains(ctx.msgToSelf.getLongmsg()): "Message not encrypted"; + assert !enc.getLongmsg().contains(ctx.msgAliceToAlice.getLongmsg()): "Message not encrypted"; log(AdapterTestUtils.msgToString(enc, false)); }); diff --git a/test/java/foundation/pEp/jniadapter/test/jni114/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/jni114/TestAlice.java index f307984..1dfa62f 100644 --- a/test/java/foundation/pEp/jniadapter/test/jni114/TestAlice.java +++ b/test/java/foundation/pEp/jniadapter/test/jni114/TestAlice.java @@ -1,7 +1,6 @@ package foundation.pEp.jniadapter.test.jni114; import static foundation.pEp.pitytest.TestLogger.*; -import static foundation.pEp.pitytest.utils.TestUtils.readKey; import static foundation.pEp.pitytest.utils.TestUtils.sleep; import foundation.pEp.jniadapter.*; @@ -38,7 +37,7 @@ class TestAlice { new TestUnit("no callback / encrypt fails nonblocking", jni114Ctx, ctx -> { ctx.alice = ctx.engine.myself(ctx.alice); try { - Message enc = ctx.engine.encrypt_message(ctx.msgToSelf, new Vector<>(), Message.EncFormat.PEP); + Message enc = ctx.engine.encrypt_message(ctx.msgAliceToAlice, new Vector<>(), Message.EncFormat.PEP); } catch (pEpException e) { assert e instanceof pEpPassphraseRequired : "wrong exception type"; return; @@ -65,10 +64,10 @@ class TestAlice { log(AdapterTestUtils.identityToString(ctx.alice, true)); // Encrypt - assert ctx.msgToSelf.getEncFormat() == Message.EncFormat.None : "Orig msg not plain"; - Message enc = ctx.engine.encrypt_message(ctx.msgToSelf, new Vector<>(), Message.EncFormat.PEP); + assert ctx.msgAliceToAlice.getEncFormat() == Message.EncFormat.None : "Orig msg not plain"; + Message enc = ctx.engine.encrypt_message(ctx.msgAliceToAlice, new Vector<>(), Message.EncFormat.PEP); assert enc.getEncFormat() == Message.EncFormat.PGPMIME : "Message not encrypted"; - assert !enc.getLongmsg().contains(ctx.msgToSelf.getLongmsg()) : "Message not encrypted"; + assert !enc.getLongmsg().contains(ctx.msgAliceToAlice.getLongmsg()) : "Message not encrypted"; log(AdapterTestUtils.msgToString(enc, false)); }); diff --git a/test/java/foundation/pEp/jniadapter/test/jni118/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/jni118/TestAlice.java index 72ff9ce..7100605 100644 --- a/test/java/foundation/pEp/jniadapter/test/jni118/TestAlice.java +++ b/test/java/foundation/pEp/jniadapter/test/jni118/TestAlice.java @@ -7,7 +7,6 @@ import foundation.pEp.pitytest.*; import foundation.pEp.pitytest.utils.TestUtils; import foundation.pEp.jniadapter.test.utils.*; -import java.util.ArrayList; import java.util.Vector; // re_evaluate_message_rating(Message m) @@ -50,9 +49,9 @@ class JNI1118Context extends AdapterBaseTestContext { Vector msgToBobRcpts = new Vector<>(); msgToBobRcpts.add(bob); - msgToBob.setTo(msgToBobRcpts); + msgAliceToBob.setTo(msgToBobRcpts); - msgToBobEncrypted = engine.encrypt_message(msgToBob, null, Message.EncFormat.PEP); + msgToBobEncrypted = engine.encrypt_message(msgAliceToBob, null, Message.EncFormat.PEP); msgToBobDecrypted = msgToBobEncrypted; msgToBobDecryptResult = engine.decrypt_message(msgToBobDecrypted, new Vector(), 0); if (msgToBobEncrypted == null) { diff --git a/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java b/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java index 75cd06f..3d95d12 100644 --- a/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java +++ b/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java @@ -32,7 +32,7 @@ class TestMain { ctx.engine.importKey(ctx.keyBobPub); // Make msg1 by encrypting msgToBob logH2("Create target Message"); - Message msg1 = ctx.engine.encrypt_message(ctx.msgToBob, null, Message.EncFormat.PEP); + Message msg1 = ctx.engine.encrypt_message(ctx.msgAliceToBob, null, Message.EncFormat.PEP); log("\n" + msgToString(msg1, false)); // Lets get the pgpText of the msg1, and the EncFormat @@ -55,7 +55,7 @@ class TestMain { ctx.engine.importKey(ctx.keyBobPub); // Make msg1 by encrypting msgToBob logH2("Create target Message"); - Message msg1 = ctx.engine.encrypt_message(ctx.msgToBob, null, Message.EncFormat.PEPEncInlineEA); + Message msg1 = ctx.engine.encrypt_message(ctx.msgAliceToBob, null, Message.EncFormat.PEPEncInlineEA); log("\n" + msgToString(msg1, false)); // Lets get the pgpText of the msg1, and the EncFormat diff --git a/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java b/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java index 84b6980..3b37924 100644 --- a/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java +++ b/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java @@ -41,9 +41,9 @@ class CTXReEvaluateMessageRating extends AdapterBaseTestContext { Vector msgToBobRcpts = new Vector<>(); msgToBobRcpts.add(bob); - msgToBob.setTo(msgToBobRcpts); + msgAliceToBob.setTo(msgToBobRcpts); - msgToBobEncrypted = engine.encrypt_message(msgToBob, null, Message.EncFormat.PEP); + msgToBobEncrypted = engine.encrypt_message(msgAliceToBob, null, Message.EncFormat.PEP); msgToBobDecrypted = msgToBobEncrypted; msgToBobDecryptResult = engine.decrypt_message(msgToBobDecrypted, new Vector(), 0); if (msgToBobEncrypted == null) { @@ -78,19 +78,19 @@ class TestMain { }); new TestUnit("Engine.encrypt_message", new AdapterBaseTestContext(), ctx -> { - ctx.engine.encrypt_message(ctx.msgToBob, null, Message.EncFormat.PEP); + ctx.engine.encrypt_message(ctx.msgAliceToBob, null, Message.EncFormat.PEP); }); new TestUnit("Engine.encrypt_message_and_add_priv_key", new CTXAlice(), ctx -> { - ctx.engine.encrypt_message_and_add_priv_key(ctx.msgToSelf, ctx.alice.fpr); + ctx.engine.encrypt_message_and_add_priv_key(ctx.msgAliceToAlice, ctx.alice.fpr); }); new TestUnit("Engine.encrypt_message_for_self", new CTXAlice(), ctx -> { - ctx.engine.encrypt_message_for_self(ctx.alice, ctx.msgToSelf, null); + ctx.engine.encrypt_message_for_self(ctx.alice, ctx.msgAliceToAlice, null); }); new TestUnit("Engine.decrypt_message", new AdapterBaseTestContext(), ctx -> { - ctx.engine.decrypt_message(ctx.msgToSelf, new Vector(), 0); + ctx.engine.decrypt_message(ctx.msgAliceToAlice, new Vector(), 0); }); new TestUnit("Engine.re_evaluate_message_rating", new CTXReEvaluateMessageRating(), ctx -> { @@ -98,11 +98,11 @@ class TestMain { }); new TestUnit("Engine.outgoing_message_rating", new AdapterBaseTestContext(), ctx -> { - ctx.engine.outgoing_message_rating(ctx.msgToBob); + ctx.engine.outgoing_message_rating(ctx.msgAliceToBob); }); new TestUnit("Engine.outgoing_message_rating_preview", new AdapterBaseTestContext(), ctx -> { - ctx.engine.outgoing_message_rating_preview(ctx.msgToBob); + ctx.engine.outgoing_message_rating_preview(ctx.msgAliceToBob); }); new TestUnit("Engine.get_identity", new CTXAlice(), ctx -> { @@ -147,7 +147,7 @@ class TestMain { }); new TestUnit("Engine.get_message_trustwords", new AdapterBaseTestContext(), ctx -> { - ctx.engine.get_message_trustwords(ctx.msgToBob, null, ctx.bob, "en", false); + ctx.engine.get_message_trustwords(ctx.msgAliceToBob, null, ctx.bob, "en", false); }); new TestUnit("Engine.get_languagelist", new AdapterBaseTestContext(), ctx -> { diff --git a/test/java/foundation/pEp/jniadapter/test/utils/AdapterBaseTestContext.java b/test/java/foundation/pEp/jniadapter/test/utils/AdapterBaseTestContext.java index 8b5ca61..1a39e73 100644 --- a/test/java/foundation/pEp/jniadapter/test/utils/AdapterBaseTestContext.java +++ b/test/java/foundation/pEp/jniadapter/test/utils/AdapterBaseTestContext.java @@ -6,12 +6,10 @@ import foundation.pEp.jniadapter.Identity; import foundation.pEp.jniadapter.Message; import foundation.pEp.pitytest.AbstractTestContext; import foundation.pEp.pitytest.TestLogger; -import foundation.pEp.pitytest.utils.TestUtils; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Vector; //public class ABAliceTestContext extends AdapterBaseTestContext { @@ -31,6 +29,7 @@ import java.util.Vector; //} + public class AdapterBaseTestContext extends AbstractTestContext { // Basic public Engine engine; @@ -61,14 +60,16 @@ public class AdapterBaseTestContext extends AbstractTestContext { private String filenameBobSec = "../resources/test_keys/bob-sec.asc"; // Messages - public Message msgToSelf; - public Message msgToBob; + public Message msgAliceToAlice; + public Message msgAliceToBob; // Message types public Message.Direction msgDirOutgoing = Message.Direction.Outgoing; - public Blob attachment1 = new Blob(); - public int attachmentsLen = 3; - public Vector attachments = new Vector(); + public Blob attachmentTiny; + public Blob attachment1KB; + public Blob attachment1MB; + public Blob attachment10MB; + public AttachmentList attachmentList = new AttachmentList(3,10000); public AdapterBaseTestContext init() throws Throwable { @@ -82,8 +83,10 @@ public class AdapterBaseTestContext extends AbstractTestContext { TestLogger.logH2("User directory:"); TestLogger.log(engine.getUserDirectory()); - attachment1 = AdapterTestUtils.makeNewTestBlob("attachment1", "attachment1.txt", "text/plain"); - attachments = AdapterTestUtils.makeNewTestBlobList(attachmentsLen); + attachmentTiny = AdapterTestUtils.makeNewTestBlob("attachment1", "attachment1.txt", "text/plain"); + attachment1KB = AdapterTestUtils.makeNewTestBlob(1000, "att with size 1KB", null); + attachment1MB = AdapterTestUtils.makeNewTestBlob(1000000, "att with size 1MB", null); + attachment10MB = AdapterTestUtils.makeNewTestBlob(10000000, "att with size 10MB", null); alice = new Identity(); alice.user_id = "23"; @@ -95,8 +98,8 @@ public class AdapterBaseTestContext extends AbstractTestContext { bob.user_id = "42"; bob.address = "bob@peptest.org"; - msgToSelf = AdapterTestUtils.makeNewTestMessage(alice, alice, Message.Direction.Outgoing); - msgToBob = AdapterTestUtils.makeNewTestMessage(alice, bob, Message.Direction.Outgoing); + msgAliceToAlice = AdapterTestUtils.makeNewTestMessage(alice, alice, Message.Direction.Outgoing); + msgAliceToBob = AdapterTestUtils.makeNewTestMessage(alice, bob, Message.Direction.Outgoing); Path path; path = Paths.get(filenameBobPub); diff --git a/test/java/foundation/pEp/jniadapter/test/utils/AttachmentList.java b/test/java/foundation/pEp/jniadapter/test/utils/AttachmentList.java new file mode 100644 index 0000000..7a24caf --- /dev/null +++ b/test/java/foundation/pEp/jniadapter/test/utils/AttachmentList.java @@ -0,0 +1,29 @@ +package foundation.pEp.jniadapter.test.utils; + +import foundation.pEp.jniadapter.Blob; + +import java.util.Vector; + +public class AttachmentList { + private Vector attachments; + private int count = 1; + private int dataSize = 100; + + public Vector getAttachments() { + return attachments; + } + + public int getCount() { + return count; + } + + public int getDataSize() { + return dataSize; + } + + public AttachmentList(int count, int dataSize) { + this.count = count; + this.dataSize = dataSize; + attachments = AdapterTestUtils.makeNewTestBlobList(dataSize, "attachment.txt", "text/plain", count); + } +}