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

Test: PityTest - Make model generic

android-nettle-update
heck 4 years ago
parent
fb7e0614b8
commit
fbade42ae9
4 changed files with 137 additions and 119 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. 86
      test/java/foundation/pEp/jniadapter/test/utils/model/TestIdentity.java
  2. 40
      test/java/foundation/pEp/jniadapter/test/utils/model/TestModel.java
  3. 69
      test/java/foundation/pEp/jniadapter/test/utils/model/TestNode.java
  4. 61
      test/java/foundation/pEp/jniadapter/test/utils/model/pEpTestIdentity.java

86
test/java/foundation/pEp/jniadapter/test/utils/model/TestIdentity.java
View File

@ -1,39 +1,37 @@
package foundation.pEp.jniadapter.test.utils.model; package foundation.pEp.jniadapter.test.utils.model;
import foundation.pEp.jniadapter.Identity;
import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.FsMQIdentity; import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.FsMQIdentity;
import java.util.*; import java.util.ArrayList;
import java.util.stream.Collectors; import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class TestIdentity { public class TestIdentity {
private TestModel model = null; private TestModel model = null; // Belongs to a TestModel (Tree struture)
private Role role = null; private Role role = null; // Assumes a Role
private Role defaultPartner = null; private Role defaultPartner = null;
public Identity pEpIdent = null; private Map<NodeName, FsMQIdentity> transportIdents = new HashMap<>();
private List<TestKeyPair> keys = new ArrayList<>(); private boolean isInitialized = false;
private TestKeyPair defaultKey = null;
private TestKeyPair defaultKeyPP = null;
private Map<NodeName,FsMQIdentity> transportIdents = new HashMap<>();
public TestIdentity(TestModel model, Role role) { public TestIdentity() {
this.model = model;
this.role = role;
pEpIdent = new Identity();
pEpIdent.username = role.toString();
pEpIdent.address = role + "@peptest.org";
this.model.addIdent(this);
} }
// public TestModel getModel() { // this method has to be called before you can do ANYTHING with this object
// return model; public void initialize( TestModel model, Role role) {
// } this.role = role;
this.model = model;
isInitialized = true;
}
public Role getRole() { public Role getRole() {
ensureInitialized();
return role; return role;
} }
public TestIdentity getDefaultPartner() { public TestIdentity getDefaultPartner() {
ensureInitialized();
return model.getIdent(defaultPartner); return model.getIdent(defaultPartner);
} }
@ -46,10 +44,11 @@ public class TestIdentity {
} }
public void addNode(TestNode node) { public void addNode(TestNode node) {
ensureInitialized();
FsMQIdentity tmp = createTransportIdentity(node); FsMQIdentity tmp = createTransportIdentity(node);
transportIdents.put(node.getName(),tmp); transportIdents.put(node.getName(), tmp);
if (node.getIdent().getRole() != getRole()) { if (node.getIdent().getRole() != getRole()) {
node.setRole(getRole()); node.setDefaultRole(getRole());
} }
} }
@ -61,45 +60,16 @@ public class TestIdentity {
return transportIdents.get(nodeName); return transportIdents.get(nodeName);
} }
public void addKey(TestKeyPair kp, boolean isDefault) {
keys.add(kp);
if (isDefault) {
if (kp.getType() == KeyType.NORMAL) {
defaultKey = kp;
} else {
defaultKeyPP = kp;
}
}
}
public TestKeyPair getDefaultKey(boolean passphrase) {
if (!passphrase) {
return defaultKey;
} else {
return defaultKeyPP;
}
}
public List<TestKeyPair> getAllKeys() {
return keys;
}
public List<TestKeyPair> getNormalKeys() {
return keys.stream().filter(i -> {
return i.getType().equals(KeyType.NORMAL);
}).collect(Collectors.toList());
}
public List<TestKeyPair> getPassphraseKeys() {
return keys.stream().filter(i -> {
return i.getType().equals(KeyType.PASSPHRASE);
}).collect(Collectors.toList());
}
private FsMQIdentity createTransportIdentity(TestNode node) { private FsMQIdentity createTransportIdentity(TestNode node) {
ensureInitialized();
String transportAddress = node.getName().toString() + getRole().toString(); String transportAddress = node.getName().toString() + getRole().toString();
String transportDir = node.getTransportDir() + getRole().toString(); String transportDir = node.getTransportDir() + getRole().toString();
return new FsMQIdentity(transportAddress, transportDir); return new FsMQIdentity(transportAddress, transportDir);
} }
private void ensureInitialized() {
if (!isInitialized) {
throw new IllegalStateException("not initialized");
}
}
} }

40
test/java/foundation/pEp/jniadapter/test/utils/model/TestModel.java
View File

@ -1,53 +1,55 @@
package foundation.pEp.jniadapter.test.utils.model; package foundation.pEp.jniadapter.test.utils.model;
import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.FsMQIdentity;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.Supplier;
public class TestModel { public class TestModel<IdentityType extends TestIdentity, NodeType extends TestNode> {
private Map<Role, TestIdentity> idents = new HashMap<>(); private Map<Role, IdentityType> idents = new HashMap<>();
private Map<NodeName, TestNode> nodes = new HashMap<>(); private Map<NodeName, NodeType> nodes = new HashMap<>();
public String dataDir = "../resources/";; public String dataDir = "../resources/";
public String nodesDir = dataDir + "nodes/"; public String nodesDir = dataDir + "nodes/";
public TestModel() { public TestModel(Supplier<IdentityType> identityTypeSupplier, Supplier<NodeType> nodeTypeSupplier) {
// Creating all Roles // Creating all Roles
for (Role r : Role.values()) { for (Role r : Role.values()) {
new TestIdentity(this, r); IdentityType tmp = identityTypeSupplier.get();
tmp.initialize(this,r);
addIdent(tmp);
} }
// Creating all Nodes // Creating all Nodes
for (NodeName n : NodeName.values()) { for (NodeName n : NodeName.values()) {
new TestNode(this, n); NodeType tmp = nodeTypeSupplier.get();
tmp.initialize(this, n);
addNode(tmp);
} }
} }
public void addIdent(TestIdentity ident) { public void addIdent(IdentityType ident) {
idents.put(ident.getRole(), ident); idents.put(ident.getRole(), ident);
} }
public TestIdentity getIdent(Role name) { public IdentityType getIdent(Role name) {
return idents.get(name); return idents.get(name);
} }
public List<TestIdentity> getAllIdents() { public List<IdentityType> getAllIdents() {
return new ArrayList<TestIdentity>(idents.values()); return new ArrayList<>(idents.values());
} }
public void addNode(TestNode node) { public void addNode(NodeType node) {
nodes.put(node.getName(), node); nodes.put(node.getName(), node);
} }
public TestNode getNode(NodeName name) { public NodeType getNode(NodeName name) {
TestNode re = nodes.get(name); return nodes.get(name);
return re;
} }
public List<TestNode> getAllNodes() { public List<NodeType> getAllNodes() {
return new ArrayList<TestNode>(nodes.values()); return new ArrayList<>(nodes.values());
} }
} }

69
test/java/foundation/pEp/jniadapter/test/utils/model/TestNode.java
View File

@ -1,74 +1,59 @@
package foundation.pEp.jniadapter.test.utils.model; package foundation.pEp.jniadapter.test.utils.model;
import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.FsMQIdentity; public class TestNode<IdentityType extends TestIdentity> {
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
public class TestNode {
private NodeName name = null; private NodeName name = null;
private TestModel model = null; private TestModel<IdentityType,TestNode<IdentityType>> model = null;
// TODO: Just one role per node for now // TODO: Just one role per node for now
// private Set<Role> ownRoles = new HashSet(); // private Set<Role> ownRoles = new HashSet();
private Role defaultRole = null; private Role defaultRole = null;
private String homeDir = null; private String homeDir = null;
private String transportDir = null; private String transportDir = null;
private boolean isInitialized = false;
public TestNode(TestModel model, NodeName name) { public TestNode() {
this.model = model; }
// this method has to be called before you can do ANYTHING with this object
public void initialize(TestModel model, NodeName name) {
this.name = name; this.name = name;
homeDir = model.nodesDir + name.toString() + "/"; this.model = model;
transportDir = homeDir + "inboxes/"; this.homeDir = model.nodesDir + name.toString() + "/";
this.model.addNode(this); this.transportDir = homeDir + "inboxes/";
this.isInitialized = true;
} }
public NodeName getName() { public NodeName getName() {
ensureInitialized();
return name; return name;
} }
// public TestModel getModel() { public void setDefaultRole(Role role) {
// return model; ensureInitialized();
// }
public void setRole(Role role) {
this.defaultRole = role; this.defaultRole = role;
TestIdentity ident = model.getIdent(role); IdentityType ident = model.getIdent(role);
if(!ident.hasNode(getName())) { if (!ident.hasNode(getName())) {
ident.addNode(this); ident.addNode(this);
} }
} }
public TestIdentity getIdent() { public IdentityType getIdent() {
ensureInitialized();
return model.getIdent(defaultRole); return model.getIdent(defaultRole);
} }
// public void addRole(Role role) {
// this.ownRoles.add(role);
// TestIdentity ident = model.getIdent(role);
// if(!ident.hasNode(getName())) {
// ident.addNode(this);
// }
// }
// public boolean hasRole(Role role) {
// return ownRoles.contains(role);
// }
// public Set<TestIdentity> getIdents() {
// Set<TestIdentity> ret = new HashSet();
// for(Role r : ownRoles) {
// ret.add(model.getIdent(r));
// }
// return ret;
// }
public String getHomeDir() { public String getHomeDir() {
ensureInitialized();
return homeDir; return homeDir;
} }
public String getTransportDir() { public String getTransportDir() {
ensureInitialized();
return transportDir; return transportDir;
} }
private void ensureInitialized() {
if (!isInitialized) {
throw new IllegalStateException("Not initialized");
}
}
} }

61
test/java/foundation/pEp/jniadapter/test/utils/model/pEpTestIdentity.java
View File

@ -0,0 +1,61 @@
package foundation.pEp.jniadapter.test.utils.model;
import foundation.pEp.jniadapter.Identity;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
public class pEpTestIdentity extends TestIdentity {
private List<pEpTestKeyPair> keys = new ArrayList<>();
public Identity pEpIdent = null;
private pEpTestKeyPair defaultKey = null;
private pEpTestKeyPair defaultKeyPP = null;
public pEpTestIdentity() {
super();
}
@Override
public void initialize(TestModel model, Role role) {
super.initialize(model, role);
pEpIdent = new Identity();
pEpIdent.username = role.toString();
pEpIdent.address = role + "@peptest.org";
}
public void addKey(pEpTestKeyPair kp, boolean isDefault) {
keys.add(kp);
if (isDefault) {
if (kp.getType() == KeyType.NORMAL) {
defaultKey = kp;
} else {
defaultKeyPP = kp;
}
}
}
public pEpTestKeyPair getDefaultKey(boolean passphrase) {
if (!passphrase) {
return defaultKey;
} else {
return defaultKeyPP;
}
}
public List<pEpTestKeyPair> getAllKeys() {
return keys;
}
public List<pEpTestKeyPair> getNormalKeys() {
return keys.stream().filter(i -> {
return i.getType().equals(KeyType.NORMAL);
}).collect(Collectors.toList());
}
public List<pEpTestKeyPair> getPassphraseKeys() {
return keys.stream().filter(i -> {
return i.getType().equals(KeyType.PASSPHRASE);
}).collect(Collectors.toList());
}
}
Write Preview
Loading…
Cancel
Save