pEp.foundation
/
pEpJNIAdapter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Test now compile with new API

pull/13/head
David Lanzendörfer 4 years ago
parent
2237fa3a1c
commit
5e80d02b40
10 changed files with 14 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      test/java/foundation/pEp/jniadapter/test/basic/TestMain.java
  2. 22
      test/java/foundation/pEp/jniadapter/test/jni118/TestAlice.java
  3. 2
      test/java/foundation/pEp/jniadapter/test/jni135/TestAlice.java
  4. 3
      test/java/foundation/pEp/jniadapter/test/jni143/TestAlice.java
  5. 3
      test/java/foundation/pEp/jniadapter/test/jni148/TestAlice.java
  6. 2
      test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java
  7. 5
      test/java/foundation/pEp/jniadapter/test/regression/TestMain.java
  8. 2
      test/java/foundation/pEp/jniadapter/test/speedtest/SpeedTest.java
  9. 3
      test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java
  10. 3
      test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestBob.java

3
test/java/foundation/pEp/jniadapter/test/basic/TestMain.java
View File

@ -2,6 +2,7 @@ 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;
@ -66,7 +67,7 @@ class TestMain {
});
new TestUnit<BasicTestContext>("Decrypt", btc, ctx -> {
ctx.result = ctx.engine.decrypt_message(ctx.enc, new Vector<>(), 0);
ctx.result = ctx.engine.decrypt_message(ctx.enc, DecryptFlags.pEpDecryptFlagOwnPrivateKey);
log(AdapterTestUtils.msgToString(ctx.result.dst, false));
});

22
test/java/foundation/pEp/jniadapter/test/jni118/TestAlice.java
View File

@ -54,7 +54,7 @@ class JNI1118Context extends CTXBase {
msgToBobEncrypted = engine.encrypt_message(msgAliceToBob, null, Message.EncFormat.PEP);
msgToBobDecrypted = msgToBobEncrypted;
msgToBobDecryptResult = engine.decrypt_message(msgToBobDecrypted, new Vector<String>(), 0);
msgToBobDecryptResult = engine.decrypt_message(msgToBobDecrypted, DecryptFlags.pEpDecryptFlagOwnPrivateKey);
if (msgToBobEncrypted == null) {
throw new RuntimeException("Context failure, error decrypting message");
}
@ -67,26 +67,6 @@ class TestAlice {
TestSuite.getDefault().setVerbose(true);
TestSuite.getDefault().setTestColor(TestUtils.TermColor.GREEN);
new TestUnit<JNI1118Context>("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<JNI1118Context>("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();
}
}

2
test/java/foundation/pEp/jniadapter/test/jni135/TestAlice.java
View File

@ -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, null, 0);
decrypt_message_Return decRet = ctx.engine.decrypt_message(msg1Enc, DecryptFlags.pEpDecryptFlagOwnPrivateKey);
assert decRet != null : "could not decrypt message";
if (!wannaLeak) {

3
test/java/foundation/pEp/jniadapter/test/jni143/TestAlice.java
View File

@ -2,6 +2,7 @@ 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;
@ -59,7 +60,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, null, 0);
decrypt_message_Return decRet = ctx.engine.decrypt_message(msg1Enc, DecryptFlags.pEpDecryptFlagOwnPrivateKey);
assert decRet != null : "could not decrypt message";
if (decRet != null) {
assert decRet.dst.getAttachments().size() == 1 : "more than 1 attachment";

3
test/java/foundation/pEp/jniadapter/test/jni148/TestAlice.java
View File

@ -3,6 +3,7 @@ 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;
@ -43,7 +44,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, null, 0);
decrypt_message_Return decRet = engine.decrypt_message(msgAliceToBobEnc, DecryptFlags.pEpDecryptFlagOwnPrivateKey);
if (decRet.dst != null) {
msgAliceToBobEncDec = decRet.dst;
}

2
test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java
View File

@ -47,7 +47,7 @@ class TestMain {
logH2("Verify msg2");
decrypt_message_Return result = null;
result = ctx.engine.decrypt_message(msg2, new Vector<String>(), 0);
result = ctx.engine.decrypt_message(msg2, DecryptFlags.pEpDecryptFlagOwnPrivateKey);
log("\n" + msgToString(result.dst, false));
}).run();

5
test/java/foundation/pEp/jniadapter/test/regression/TestMain.java
View File

@ -45,12 +45,11 @@ class CTXReEvaluateMessageRating extends CTXBase {
msgToBobEncrypted = engine.encrypt_message(msgAliceToBob, null, Message.EncFormat.PEP);
msgToBobDecrypted = msgToBobEncrypted;
msgToBobDecryptResult = engine.decrypt_message(msgToBobDecrypted, new Vector<String>(), 0);
msgToBobDecryptResult = engine.decrypt_message(msgToBobDecrypted, DecryptFlags.pEpDecryptFlagOwnPrivateKey);
if (msgToBobEncrypted == null) {
throw new RuntimeException("Context failure, error decrypting message");
}
addRatingToOptFields(msgToBobDecrypted, msgToBobDecryptResult.rating.getInternalStringValue());
addRcptsToOptFields(msgToBobDecrypted, Identity.toXKeyList(msgToBobDecrypted.getTo()));
return this;
}
@ -90,7 +89,7 @@ class TestMain {
});
new TestUnit<CTXBase>("Engine.decrypt_message", new CTXBase(), ctx -> {
ctx.engine.decrypt_message(ctx.msgAliceToAlice, new Vector<String>(), 0);
ctx.engine.decrypt_message(ctx.msgAliceToAlice, DecryptFlags.pEpDecryptFlagOwnPrivateKey);
});
new TestUnit<CTXReEvaluateMessageRating>("Engine.re_evaluate_message_rating", new CTXReEvaluateMessageRating(), ctx -> {

2
test/java/foundation/pEp/jniadapter/test/speedtest/SpeedTest.java
View File

@ -28,7 +28,7 @@ public class SpeedTest {
try {
Message[] msgs = codec.decode(testDataEnc);
Vector<String> keys = new Vector<String>();
decrypt_message_Return ret = eng.decrypt_message(msgs[0], keys, 0);
decrypt_message_Return ret = eng.decrypt_message(msgs[0], DecryptFlags.pEpDecryptFlagOwnPrivateKey);
String txt = ret.dst.getLongmsg();
} catch (ParseException ex) {
System.err.println("error: parsing test data");

3
test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java
View File

@ -59,9 +59,8 @@ 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, null, 0);
decrypt_message_Return result = ctx.engine.decrypt_message(msgRx, DecryptFlags.pEpDecryptFlagOwnPrivateKey);
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));

3
test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestBob.java
View File

@ -39,9 +39,8 @@ 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, null, 0);
decrypt_message_Return result = ctx.engine.decrypt_message(msgRx, DecryptFlags.pEpDecryptFlagOwnPrivateKey);
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));

Write Preview
Loading…
Cancel
Save