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

Use TestFramework/TestSuite in tests "basic" and "regression"

JNI-96
heck 5 years ago
parent
b0aeb6531b
commit
f2fb51c9e5
3 changed files with 77 additions and 65 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. 28
      test/java/foundation/pEp/jniadapter/test/basic/TestMain.java
  2. 6
      test/java/foundation/pEp/jniadapter/test/framework/TestSuite.java
  3. 108
      test/java/foundation/pEp/jniadapter/test/regression/TestMain.java

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

@ -4,6 +4,7 @@ import foundation.pEp.jniadapter.Blob;
import foundation.pEp.jniadapter.Engine;
import foundation.pEp.jniadapter.Identity;
import foundation.pEp.jniadapter.Message;
import foundation.pEp.jniadapter.test.framework.TestSuite;
import foundation.pEp.jniadapter.test.framework.TestUnit;
import foundation.pEp.jniadapter.test.utils.AdapterBaseTestContext;
import foundation.pEp.jniadapter.test.utils.AdapterTestUtils;
@ -23,23 +24,24 @@ class BasicTestContext extends AdapterBaseTestContext {
class TestMain {
public static void main(String[] args) {
TestSuite.setVerbose(true);
BasicTestContext btc = new BasicTestContext();
new TestUnit<BasicTestContext>("Gen Keys", btc, ctx -> {
ctx.alice = ctx.engine.myself(ctx.alice);
log("Keys generated: " + ctx.alice.fpr);
}).run();
}).add();
new TestUnit<BasicTestContext>("Import key", btc, ctx -> {
ctx.engine.importKey(ctx.keyBobPub);
}).run();
}).add();
new TestUnit<BasicTestContext>("Trustwords", btc, ctx -> {
ctx.carol = new Identity();
ctx.carol.fpr = "4ABE3AAF59AC32CFE4F86500A9411D176FF00E97";
String t = ctx.engine.trustwords(ctx.carol);
log("Trustwords: " + t);
}).run();
}).add();
new TestUnit<BasicTestContext>("setAttachments", btc, ctx -> {
int nrAttachemnts = 3;
@ -54,33 +56,33 @@ class TestMain {
attachments.add(blb);
}
ctx.msgToBob.setAttachments(attachments);
}).run();
}).add();
new TestUnit<BasicTestContext>("Encrypt", btc, ctx -> {
ctx.enc = ctx.engine.encrypt_message(ctx.msgToBob, null, Message.EncFormat.PEP);
log(AdapterTestUtils.msgToString(ctx.enc, false));
}).run();
}).add();
new TestUnit<BasicTestContext>("Rating Preview", btc, ctx -> {
log("Rating preview: " + ctx.engine.outgoing_message_rating_preview(ctx.msgToBob));
}).run();
}).add();
new TestUnit<BasicTestContext>("Rating", btc, ctx -> {
log("Rating" + ctx.engine.outgoing_message_rating(ctx.msgToBob));
}).run();
}).add();
new TestUnit<BasicTestContext>("Decrypt", btc, ctx -> {
ctx.result = ctx.engine.decrypt_message(ctx.enc, new Vector<>(), 0);
log(AdapterTestUtils.msgToString(ctx.result.dst, false));
}).run();
}).add();
new TestUnit<BasicTestContext>("key_reset_all_own_keys()", btc, ctx -> {
ctx.engine.key_reset_all_own_keys();
}).run();
}).add();
new TestUnit<BasicTestContext>("startSync()", btc, ctx -> {
ctx.engine.startSync();
}).run();
}).add();
new TestUnit<BasicTestContext>("Keygen2", btc, ctx -> {
Identity user2 = new Identity();
@ -90,11 +92,13 @@ class TestMain {
user2.address = "jniTestUser2@peptest.ch";
user2 = ctx.engine.myself(user2);
log("Keys generated: " + user2.fpr);
}).run();
}).add();
new TestUnit<BasicTestContext>("stopSync()", btc, ctx -> {
ctx.engine.stopSync();
}).run();
}).add();
TestSuite.run();
}
}

6
test/java/foundation/pEp/jniadapter/test/framework/TestSuite.java
View File

@ -44,9 +44,13 @@ public class TestSuite {
failedCount = failedCount + skippedCount;
log("SUCCESS: " + successCount, TermColor.GREEN);
TermColor failedColor = TermColor.RED;
if (failedCount <= 0) {
failedColor = TermColor.RESET;
}
String failedStr = "FAILED : " + failedCount;
if(skippedCount > 0 ) failedStr += " ("+skippedCount + " Skipped)";
log(failedStr, TermColor.RED);
log(failedStr, failedColor);
log("TOTAL : " + totalCount);
}
}

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

@ -15,27 +15,29 @@ class RegTestContext extends AdapterBaseTestContext {
class TestMain {
public static void main(String[] args) {
TestSuite.setVerbose(false);
new TestUnit<RegTestContext>("Engine.myself", new RegTestContext(), ctx -> {
ctx.alice = ctx.engine.myself(ctx.alice);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.encrypt_message", new RegTestContext(), ctx -> {
ctx.engine.encrypt_message(ctx.msgToBob, null, Message.EncFormat.PEP);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.encrypt_message_and_add_priv_key", new RegTestContext(), ctx -> {
ctx.alice = ctx.engine.myself(ctx.alice);
ctx.engine.encrypt_message_and_add_priv_key(ctx.msgToSelf, ctx.alice.fpr);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.encrypt_message_for_self", new RegTestContext(), ctx -> {
ctx.alice = ctx.engine.myself(ctx.alice);
ctx.engine.encrypt_message_for_self(ctx.alice, ctx.msgToSelf, null);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.decrypt_message", new RegTestContext(), ctx -> {
ctx.engine.decrypt_message(ctx.msgToSelf, ctx.vStr, 0);
}).run();
}).add();
//TODO: Coredump
// new TestUnit<RegTestContext>("Engine.re_evaluate_message_rating", new RegTestContext(), ctx -> {
@ -43,29 +45,29 @@ class TestMain {
// ctx.bob = ctx.engine.myself(ctx.bob);
// Message msg = ctx.engine.encrypt_message(ctx.msgToBob,null, Message.EncFormat.PEP);
// ctx.engine.re_evaluate_message_rating(msg);
// }).run();
// }).add();
new TestUnit<RegTestContext>("Engine.outgoing_message_rating", new RegTestContext(), ctx -> {
ctx.engine.outgoing_message_rating(ctx.msgToBob);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.outgoing_message_rating_preview", new RegTestContext(), ctx -> {
ctx.engine.outgoing_message_rating_preview(ctx.msgToBob);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.get_identity", new RegTestContext(), ctx -> {
ctx.alice = ctx.engine.myself(ctx.alice);
ctx.engine.get_identity(ctx.alice.address, ctx.alice.user_id);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.identity_rating", new RegTestContext(), ctx -> {
ctx.alice = ctx.engine.myself(ctx.alice);
ctx.engine.identity_rating(ctx.alice);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.blacklist_retrieve", new RegTestContext(), ctx -> {
ctx.engine.blacklist_retrieve();
}).run();
}).add();
//FAIL
new TestUnit<RegTestContext>("Engine.own_message_private_key_details", new RegTestContext(), ctx -> {
@ -74,67 +76,67 @@ class TestMain {
ctx.engine.encrypt_message(ctx.msgToBob, null, Message.EncFormat.PEP);
ctx.engine.own_message_private_key_details(ctx.msgToBob);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.OpenPGP_list_keyinfo", new RegTestContext(), ctx -> {
ctx.engine.OpenPGP_list_keyinfo("");
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.set_identity_flags", new RegTestContext(), ctx -> {
ctx.engine.set_identity_flags(ctx.alice, 0);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.unset_identity_flags", new RegTestContext(), ctx -> {
ctx.engine.unset_identity_flags(ctx.alice, 0);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.own_identities_retrieve", new RegTestContext(), ctx -> {
ctx.engine.own_identities_retrieve();
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.get_trustwords", new RegTestContext(), ctx -> {
ctx.alice = ctx.engine.myself(ctx.alice);
ctx.bob = ctx.engine.myself(ctx.bob);
ctx.engine.get_trustwords(ctx.alice, ctx.bob, "en", false);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.get_trustwords_for_fprs", new RegTestContext(), ctx -> {
ctx.alice = ctx.engine.myself(ctx.alice);
ctx.bob = ctx.engine.myself(ctx.bob);
ctx.engine.get_trustwords_for_fprs(ctx.alice.fpr, ctx.bob.fpr, "en", false);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.get_message_trustwords", new RegTestContext(), ctx -> {
ctx.engine.get_message_trustwords(ctx.msgToBob, null, ctx.bob, "en", false);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.get_languagelist", new RegTestContext(), ctx -> {
ctx.engine.get_languagelist();
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.key_reset_trust", new RegTestContext(), ctx -> {
ctx.alice = ctx.engine.myself(ctx.alice);
ctx.engine.key_reset_trust(ctx.alice);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.key_reset_identity", new RegTestContext(), ctx -> {
ctx.alice = ctx.engine.myself(ctx.alice);
ctx.engine.key_reset_identity(ctx.alice, "");
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.key_reset_user", new RegTestContext(), ctx -> {
ctx.alice = ctx.engine.myself(ctx.alice);
ctx.engine.key_reset_user("fsdjugsh", ctx.alice.fpr);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.key_reset_all_own_keys", new RegTestContext(), ctx -> {
ctx.engine.key_reset_all_own_keys();
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.deliverHandshakeResult", new RegTestContext(), ctx -> {
ctx.engine.deliverHandshakeResult(SyncHandshakeResult.SyncHandshakeCancel, ctx.vID);
}).run();
}).add();
//[17:51] < heck> | this one fails since: 4665:f067c9e95455
@ -146,117 +148,119 @@ class TestMain {
// new TestUnit<RegTestContext>("Engine.leave_device_group", new RegTestContext(), ctx -> {
// ctx.engine.startSync();
// ctx.engine.leave_device_group();
// }).run();
// }).add();
new TestUnit<RegTestContext>("Engine.enable_identity_for_sync", new RegTestContext(), ctx -> {
ctx.alice = ctx.engine.myself(ctx.alice);
ctx.engine.enable_identity_for_sync(ctx.alice);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.disable_identity_for_sync", new RegTestContext(), ctx -> {
ctx.alice = ctx.engine.myself(ctx.alice);
ctx.engine.disable_identity_for_sync(ctx.alice);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.config_cipher_suite", new RegTestContext(), ctx -> {
ctx.engine.config_cipher_suite(CipherSuite.pEpCipherSuiteDefault);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.trustwords", new RegTestContext(), ctx -> {
ctx.engine.trustwords(ctx.alice);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.updateIdentity", new RegTestContext(), ctx -> {
ctx.engine.updateIdentity(ctx.alice);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.setOwnKey", new RegTestContext(), ctx -> {
ctx.alice = ctx.engine.myself(ctx.alice);
ctx.engine.setOwnKey(ctx.alice, ctx.alice.fpr);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.keyMistrusted", new RegTestContext(), ctx -> {
ctx.alice = ctx.engine.myself(ctx.alice);
ctx.engine.keyMistrusted(ctx.alice);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.keyResetTrust", new RegTestContext(), ctx -> {
ctx.engine.keyResetTrust(ctx.alice);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.trustPersonalKey", new RegTestContext(), ctx -> {
ctx.engine.trustPersonalKey(ctx.alice);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.trustOwnKey", new RegTestContext(), ctx -> {
ctx.alice = ctx.engine.myself(ctx.alice);
ctx.engine.trustOwnKey(ctx.alice);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.importKey", new RegTestContext(), ctx -> {
ctx.engine.importKey(ctx.keyBobPub);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.blacklist_add", new RegTestContext(), ctx -> {
ctx.engine.blacklist_add("43");
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.blacklist_delete", new RegTestContext(), ctx -> {
ctx.engine.blacklist_delete("43");
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.blacklist_is_listed", new RegTestContext(), ctx -> {
ctx.engine.blacklist_is_listed("43");
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.config_passive_mode", new RegTestContext(), ctx -> {
ctx.engine.config_passive_mode(false);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.config_unencrypted_subject", new RegTestContext(), ctx -> {
ctx.engine.config_unencrypted_subject(false);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.getCrashdumpLog", new RegTestContext(), ctx -> {
ctx.engine.getCrashdumpLog(0);
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.getUserDirectory", new RegTestContext(), ctx -> {
ctx.engine.getUserDirectory();
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.getMachineDirectory", new RegTestContext(), ctx -> {
ctx.engine.getMachineDirectory();
}).run();
}).add();
// AbstractEngine.java
new TestUnit<RegTestContext>("Engine.close", new RegTestContext(), ctx -> {
ctx.engine.close();
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.getVersion", new RegTestContext(), ctx -> {
ctx.engine.getVersion();
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.getProtocolVersion", new RegTestContext(), ctx -> {
ctx.engine.getProtocolVersion();
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.startKeyserverLookup", new RegTestContext(), ctx -> {
ctx.engine.startKeyserverLookup();
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.startSync", new RegTestContext(), ctx -> {
ctx.engine.startSync();
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.stopSync", new RegTestContext(), ctx -> {
ctx.engine.stopSync();
}).run();
}).add();
new TestUnit<RegTestContext>("Engine.isSyncRunning", new RegTestContext(), ctx -> {
ctx.engine.isSyncRunning();
}).run();
}).add();
TestSuite.run();
}
}

Write Preview
Loading…
Cancel
Save