diff --git a/test/java/foundation/pEp/jniadapter/test/basic/TestMain.java b/test/java/foundation/pEp/jniadapter/test/basic/TestMain.java index 1d70d73..da1e8b0 100644 --- a/test/java/foundation/pEp/jniadapter/test/basic/TestMain.java +++ b/test/java/foundation/pEp/jniadapter/test/basic/TestMain.java @@ -2,7 +2,6 @@ package foundation.pEp.jniadapter.test.basic; import foundation.pEp.jniadapter.Identity; import foundation.pEp.jniadapter.Message; -import foundation.pEp.jniadapter.DecryptFlags; import foundation.pEp.jniadapter.decrypt_message_Return; import foundation.pEp.jniadapter.test.utils.CTXBase; import foundation.pEp.jniadapter.test.utils.AdapterTestUtils; @@ -67,7 +66,7 @@ class TestMain { }); new TestUnit("Decrypt", btc, ctx -> { - ctx.result = ctx.engine.decrypt_message(ctx.enc, DecryptFlags.pEpDecryptFlagOwnPrivateKey); + ctx.result = ctx.engine.decrypt_message(ctx.enc, new Vector<>(), 0); log(AdapterTestUtils.msgToString(ctx.result.dst, false)); }); diff --git a/test/java/foundation/pEp/jniadapter/test/jni118/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/jni118/TestAlice.java index 437fa70..086ee53 100644 --- a/test/java/foundation/pEp/jniadapter/test/jni118/TestAlice.java +++ b/test/java/foundation/pEp/jniadapter/test/jni118/TestAlice.java @@ -54,7 +54,7 @@ class JNI1118Context extends CTXBase { msgToBobEncrypted = engine.encrypt_message(msgAliceToBob, null, Message.EncFormat.PEP); msgToBobDecrypted = msgToBobEncrypted; - msgToBobDecryptResult = engine.decrypt_message(msgToBobDecrypted, DecryptFlags.pEpDecryptFlagOwnPrivateKey); + msgToBobDecryptResult = engine.decrypt_message(msgToBobDecrypted, new Vector(), 0); if (msgToBobEncrypted == null) { throw new RuntimeException("Context failure, error decrypting message"); } @@ -67,6 +67,26 @@ class TestAlice { TestSuite.getDefault().setVerbose(true); TestSuite.getDefault().setTestColor(TestUtils.TermColor.GREEN); + new TestUnit("re_evaluate_message_rating() equal to decrypt_message_result.rating when Message has correct OptFields", new JNI1118Context(), ctx -> { + AdapterTestUtils.addRatingToOptFields(ctx.msgToBobDecrypted,ctx.msgToBobDecryptResult.rating.getInternalStringValue()); + AdapterTestUtils.addRcptsToOptFields(ctx.msgToBobDecrypted,Identity.toXKeyList(ctx.msgToBobDecrypted.getTo())); + log("running re_evaluate_message_rating() on:\n" + AdapterTestUtils.msgToString(ctx.msgToBobDecrypted, false)); + Rating rat = ctx.engine.re_evaluate_message_rating(ctx.msgToBobDecrypted); + log("re_evaluate_message_rating() result: " + rat.toString()); + assert rat == ctx.msgToBobDecryptResult.rating : "Rating is " + rat.toString() + ",but should be " + ctx.msgToBobDecryptResult.rating.toString(); + }); + + new TestUnit("re_evaluate_message_rating() equal to decrypt_message_result.rating when Message has random rating string on XEncStatus", new JNI1118Context(), ctx -> { + AdapterTestUtils.addRatingToOptFields(ctx.msgToBobDecrypted, TestUtils.randomASCIIString(TestUtils.EASCIICharClassName.All, TestUtils.randomInt(new RangeInt(0,42)))); + AdapterTestUtils.addRcptsToOptFields(ctx.msgToBobDecrypted,Identity.toXKeyList(ctx.msgToBobDecrypted.getTo())); + log("running re_evaluate_message_rating() on:\n" + AdapterTestUtils.msgToString(ctx.msgToBobDecrypted, false)); + Rating rat = ctx.engine.re_evaluate_message_rating(ctx.msgToBobDecrypted); + log("re_evaluate_message_rating() result: " + rat.toString()); + assert rat == ctx.msgToBobDecryptResult.rating : "Rating is " + rat.toString() + ",but should be " + ctx.msgToBobDecryptResult.rating.toString(); + }); + + + TestSuite.getDefault().run(); } } diff --git a/test/java/foundation/pEp/jniadapter/test/jni135/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/jni135/TestAlice.java index cf5f4d2..9e1d9a5 100644 --- a/test/java/foundation/pEp/jniadapter/test/jni135/TestAlice.java +++ b/test/java/foundation/pEp/jniadapter/test/jni135/TestAlice.java @@ -91,7 +91,7 @@ class TestAlice { msg1Plain.setAttachments(atts); Message msg1Enc = ctx.engine.encrypt_message(msg1Plain, null, ctx.encFormat); - decrypt_message_Return decRet = ctx.engine.decrypt_message(msg1Enc, DecryptFlags.pEpDecryptFlagOwnPrivateKey); + decrypt_message_Return decRet = ctx.engine.decrypt_message(msg1Enc, null, 0); assert decRet != null : "could not decrypt message"; if (!wannaLeak) { diff --git a/test/java/foundation/pEp/jniadapter/test/jni143/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/jni143/TestAlice.java index 82d3f29..66e3cce 100644 --- a/test/java/foundation/pEp/jniadapter/test/jni143/TestAlice.java +++ b/test/java/foundation/pEp/jniadapter/test/jni143/TestAlice.java @@ -2,7 +2,6 @@ package foundation.pEp.jniadapter.test.jni143; import foundation.pEp.jniadapter.Blob; import foundation.pEp.jniadapter.Message; -import foundation.pEp.jniadapter.DecryptFlags; import foundation.pEp.jniadapter.decrypt_message_Return; import foundation.pEp.jniadapter.test.utils.AdapterTestUtils; import foundation.pEp.jniadapter.test.utils.CTXBase; @@ -60,7 +59,7 @@ class TestAlice { logH2("attachment size: " + attachmentSizeBytes); Message msg1Enc = ctx.engine.encrypt_message(msg1Plain, null, Message.EncFormat.PEP); - decrypt_message_Return decRet = ctx.engine.decrypt_message(msg1Enc, DecryptFlags.pEpDecryptFlagOwnPrivateKey); + decrypt_message_Return decRet = ctx.engine.decrypt_message(msg1Enc, null, 0); assert decRet != null : "could not decrypt message"; if (decRet != null) { assert decRet.dst.getAttachments().size() == 1 : "more than 1 attachment"; diff --git a/test/java/foundation/pEp/jniadapter/test/jni148/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/jni148/TestAlice.java index ccf2faa..6c71b9d 100644 --- a/test/java/foundation/pEp/jniadapter/test/jni148/TestAlice.java +++ b/test/java/foundation/pEp/jniadapter/test/jni148/TestAlice.java @@ -3,7 +3,6 @@ package foundation.pEp.jniadapter.test.jni148; import foundation.pEp.jniadapter.Identity; import foundation.pEp.jniadapter.Message; -import foundation.pEp.jniadapter.DecryptFlags; import foundation.pEp.jniadapter.decrypt_message_Return; import foundation.pEp.jniadapter.test.utils.AdapterTestUtils; import foundation.pEp.jniadapter.test.utils.CTXBase; @@ -44,7 +43,7 @@ class CTX148 extends CTXBase { msgAliceToBob.setTo(to); msgAliceToBobEnc = engine.encrypt_message(msgAliceToBob, null, Message.EncFormat.PEP); - decrypt_message_Return decRet = engine.decrypt_message(msgAliceToBobEnc, DecryptFlags.pEpDecryptFlagOwnPrivateKey); + decrypt_message_Return decRet = engine.decrypt_message(msgAliceToBobEnc, null, 0); if (decRet.dst != null) { msgAliceToBobEncDec = decRet.dst; } diff --git a/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java b/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java index 20a57ab..a44b67d 100644 --- a/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java +++ b/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java @@ -47,7 +47,7 @@ class TestMain { logH2("Verify msg2"); decrypt_message_Return result = null; - result = ctx.engine.decrypt_message(msg2, DecryptFlags.pEpDecryptFlagOwnPrivateKey); + result = ctx.engine.decrypt_message(msg2, new Vector(), 0); log("\n" + msgToString(result.dst, false)); }).run(); diff --git a/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java b/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java index d376eb6..6e1890f 100644 --- a/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java +++ b/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java @@ -45,11 +45,12 @@ class CTXReEvaluateMessageRating extends CTXBase { msgToBobEncrypted = engine.encrypt_message(msgAliceToBob, null, Message.EncFormat.PEP); msgToBobDecrypted = msgToBobEncrypted; - msgToBobDecryptResult = engine.decrypt_message(msgToBobDecrypted, DecryptFlags.pEpDecryptFlagOwnPrivateKey); + msgToBobDecryptResult = engine.decrypt_message(msgToBobDecrypted, new Vector(), 0); if (msgToBobEncrypted == null) { throw new RuntimeException("Context failure, error decrypting message"); } + addRatingToOptFields(msgToBobDecrypted, msgToBobDecryptResult.rating.getInternalStringValue()); addRcptsToOptFields(msgToBobDecrypted, Identity.toXKeyList(msgToBobDecrypted.getTo())); return this; } @@ -89,7 +90,7 @@ class TestMain { }); new TestUnit("Engine.decrypt_message", new CTXBase(), ctx -> { - ctx.engine.decrypt_message(ctx.msgAliceToAlice, DecryptFlags.pEpDecryptFlagOwnPrivateKey); + ctx.engine.decrypt_message(ctx.msgAliceToAlice, new Vector(), 0); }); new TestUnit("Engine.re_evaluate_message_rating", new CTXReEvaluateMessageRating(), ctx -> { diff --git a/test/java/foundation/pEp/jniadapter/test/speedtest/SpeedTest.java b/test/java/foundation/pEp/jniadapter/test/speedtest/SpeedTest.java index 431f334..21f49f2 100644 --- a/test/java/foundation/pEp/jniadapter/test/speedtest/SpeedTest.java +++ b/test/java/foundation/pEp/jniadapter/test/speedtest/SpeedTest.java @@ -28,7 +28,7 @@ public class SpeedTest { try { Message[] msgs = codec.decode(testDataEnc); Vector keys = new Vector(); - decrypt_message_Return ret = eng.decrypt_message(msgs[0], DecryptFlags.pEpDecryptFlagOwnPrivateKey); + decrypt_message_Return ret = eng.decrypt_message(msgs[0], keys, 0); String txt = ret.dst.getLongmsg(); } catch (ParseException ex) { System.err.println("error: parsing test data"); diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java index c3c2500..f872423 100644 --- a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java +++ b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java @@ -59,8 +59,9 @@ class TestAlice { Message msgRx = Utils.deserializepEpMessage(ctx, msgRxSerialized, Message.EncFormat.PEPEncInlineEA); log("ENCRYPTED IN: \n" + AdapterTestUtils.msgToString(msgRx, false)); - decrypt_message_Return result = ctx.engine.decrypt_message(msgRx, DecryptFlags.pEpDecryptFlagOwnPrivateKey); + decrypt_message_Return result = ctx.engine.decrypt_message(msgRx, null, 0); log("DECRYPTED msg: \n" + AdapterTestUtils.msgToString(result.dst, false)); + log("DECRYPTED rating:" + result.rating.toString()); log("DECRYPTED flags:" + result.flags); log(AdapterTestUtils.identityToString(ctx.bob, false)); diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestBob.java b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestBob.java index 23ff71a..d5e477e 100644 --- a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestBob.java +++ b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestBob.java @@ -39,8 +39,9 @@ class TestBob { Message msgRx = Utils.deserializepEpMessage(ctx, msgRxSerialized, Message.EncFormat.PEPEncInlineEA); log("ENCRYPTED IN: \n" + AdapterTestUtils.msgToString(msgRx, false)); - decrypt_message_Return result = ctx.engine.decrypt_message(msgRx, DecryptFlags.pEpDecryptFlagOwnPrivateKey); + decrypt_message_Return result = ctx.engine.decrypt_message(msgRx, null, 0); log("DECRYPTED msg: \n" + AdapterTestUtils.msgToString(result.dst, false)); + log("DECRYPTED rating:" + result.rating.toString()); log("DECRYPTED flags:" + result.flags); log(AdapterTestUtils.identityToString(ctx.alice, false));