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

Tests: CTXBase - update for refined TestModel

JNI-153
heck 4 years ago
parent
926db0ae25
commit
5c64bb184d
1 changed files with 24 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 73
      test/java/foundation/pEp/jniadapter/test/utils/CTXBase.java

73
test/java/foundation/pEp/jniadapter/test/utils/CTXBase.java
View File

@ -46,16 +46,16 @@ public class CTXBase extends AbstractTestContext {
engine.setNotifyHandshakeCallback(callbacks); engine.setNotifyHandshakeCallback(callbacks);
setupModel(); setupModel();
alice = model.get(Role.ALICE).pEpIdent; alice = model.getIdent(Role.ALICE).pEpIdent;
bob = model.get(Role.BOB).pEpIdent; bob = model.getIdent(Role.BOB).pEpIdent;
carol = model.get(Role.CAROL).pEpIdent; carol = model.getIdent(Role.CAROL).pEpIdent;
keyAlicePub = model.get(Role.ALICE).getDefaultKey(false).getKeyPub(); keyAlicePub = model.getIdent(Role.ALICE).getDefaultKey(false).getKeyPub();
keyAliceSec = model.get(Role.ALICE).getDefaultKey(false).getKeySec(); keyAliceSec = model.getIdent(Role.ALICE).getDefaultKey(false).getKeySec();
keyAlicePubPassphrase = model.get(Role.ALICE).getDefaultKey(true).getKeyPub(); keyAlicePubPassphrase = model.getIdent(Role.ALICE).getDefaultKey(true).getKeyPub();
keyAliceSecPassphrase = model.get(Role.ALICE).getDefaultKey(true).getKeySec(); keyAliceSecPassphrase = model.getIdent(Role.ALICE).getDefaultKey(true).getKeySec();
keyBobPub = model.get(Role.BOB).getDefaultKey(false).getKeyPub(); keyBobPub = model.getIdent(Role.BOB).getDefaultKey(false).getKeyPub();
keyBobSec = model.get(Role.BOB).getDefaultKey(false).getKeySec(); keyBobSec = model.getIdent(Role.BOB).getDefaultKey(false).getKeySec();
TestLogger.logH2("Machine directory: "); TestLogger.logH2("Machine directory: ");
TestLogger.log(engine.getMachineDirectory()); TestLogger.log(engine.getMachineDirectory());
@ -71,43 +71,18 @@ public class CTXBase extends AbstractTestContext {
} }
private void setupModel() { private void setupModel() {
// Idents // Idents to Nodes (1-n)
{ model.getNode(NodeName.NODE_A1).setRole(Role.ALICE);
model.add(new TestIdentity(Role.ALICE)); model.getNode(NodeName.NODE_B1).setRole(Role.BOB);
model.add(new TestIdentity(Role.BOB)); model.getNode(NodeName.NODE_C1).setRole(Role.CAROL);
model.add(new TestIdentity(Role.CAROL)); model.getNode(NodeName.NODE_A2).setRole(Role.ALICE);
} model.getNode(NodeName.NODE_B2).setRole(Role.BOB);
// Nodes model.getNode(NodeName.NODE_C2).setRole(Role.CAROL);
{
TestNode tn = new TestNode(Node.NODE_A1); // Default Partner
tn.addOwnIdent(model.get(Role.ALICE)); model.getIdent(Role.ALICE).setDefaultPartner(Role.BOB);
model.add(tn); model.getIdent(Role.BOB).setDefaultPartner(Role.CAROL);
} model.getIdent(Role.CAROL).setDefaultPartner(Role.ALICE);
{
TestNode tn = new TestNode(Node.NODE_B1);
tn.addOwnIdent(model.get(Role.BOB));
model.add(tn);
}
{
TestNode tn = new TestNode(Node.NODE_C1);
tn.addOwnIdent(model.get(Role.CAROL));
model.add(tn);
}
{
TestNode tn = new TestNode(Node.NODE_A2);
tn.addOwnIdent(model.get(Role.ALICE));
model.add(tn);
}
{
TestNode tn = new TestNode(Node.NODE_B2);
tn.addOwnIdent(model.get(Role.BOB));
model.add(tn);
}
{
TestNode tn = new TestNode(Node.NODE_C2);
tn.addOwnIdent(model.get(Role.CAROL));
model.add(tn);
}
// Keys // Keys
{ {
@ -115,13 +90,13 @@ public class CTXBase extends AbstractTestContext {
String pathSec = "../resources/test_keys/alice-sec-DE5DF92A358DCE5F.asc"; String pathSec = "../resources/test_keys/alice-sec-DE5DF92A358DCE5F.asc";
String pathPubPP = "../resources/test_keys/alice-passphrase-pub-BCBAC48800026D6F.asc"; String pathPubPP = "../resources/test_keys/alice-passphrase-pub-BCBAC48800026D6F.asc";
String pathSecPP = "../resources/test_keys/alice-passphrase-sec-BCBAC48800026D6F.asc"; String pathSecPP = "../resources/test_keys/alice-passphrase-sec-BCBAC48800026D6F.asc";
new TestKeyPair(model.get(Role.ALICE), pathPub, pathSec, true); new TestKeyPair(model.getIdent(Role.ALICE), pathPub, pathSec, true);
new TestKeyPair(model.get(Role.ALICE), pathPubPP, pathSecPP, "passphrase_alice", true); new TestKeyPair(model.getIdent(Role.ALICE), pathPubPP, pathSecPP, "passphrase_alice", true);
} }
{ {
String pathPub = "../resources/test_keys/bob-pub.asc"; String pathPub = "../resources/test_keys/bob-pub.asc";
String pathSec = "../resources/test_keys/bob-sec.asc"; String pathSec = "../resources/test_keys/bob-sec.asc";
new TestKeyPair(model.get(Role.BOB), pathPub, pathSec, true); new TestKeyPair(model.getIdent(Role.BOB), pathPub, pathSec, true);
} }
} }

Write Preview
Loading…
Cancel
Save