Browse Source

Tests: vStr and vID not basic enough for AdapterBaseTestContext (formatting of interface, just formatting)

JNI-118
heck 5 years ago
parent
commit
3028e1af4f
  1. 4
      test/java/foundation/pEp/jniadapter/test/jni100/TestMain.java
  2. 4
      test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java
  3. 10
      test/java/foundation/pEp/jniadapter/test/utils/AdapterBaseTestContext.java
  4. 6
      test/java/foundation/pEp/pitytest/TestContextInterface.java

4
test/java/foundation/pEp/jniadapter/test/jni100/TestMain.java

@ -3,6 +3,8 @@ import foundation.pEp.pitytest.*;
import foundation.pEp.jniadapter.*; import foundation.pEp.jniadapter.*;
import foundation.pEp.jniadapter.test.utils.*; import foundation.pEp.jniadapter.test.utils.*;
import java.util.Vector;
class TestMain { class TestMain {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
@ -15,7 +17,7 @@ class TestMain {
ctx.alice = ctx.engine.myself(ctx.alice); ctx.alice = ctx.engine.myself(ctx.alice);
TestLogger.log(AdapterTestUtils.identityToString(ctx.alice, true)); TestLogger.log(AdapterTestUtils.identityToString(ctx.alice, true));
Message msg1 = ctx.engine.encrypt_message(ctx.msgToBob, ctx.vStr, Message.EncFormat.PEP); Message msg1 = ctx.engine.encrypt_message(ctx.msgToBob, new Vector<String>(), Message.EncFormat.PEP);
ctx.engine.key_reset_all_own_keys(); ctx.engine.key_reset_all_own_keys();

4
test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java

@ -5,6 +5,8 @@ import foundation.pEp.jniadapter.Message;
import foundation.pEp.pitytest.TestUnit; import foundation.pEp.pitytest.TestUnit;
import foundation.pEp.jniadapter.test.utils.AdapterBaseTestContext; import foundation.pEp.jniadapter.test.utils.AdapterBaseTestContext;
import java.util.Vector;
import static foundation.pEp.pitytest.TestLogger.log; import static foundation.pEp.pitytest.TestLogger.log;
import static foundation.pEp.pitytest.TestLogger.logH2; import static foundation.pEp.pitytest.TestLogger.logH2;
import static foundation.pEp.jniadapter.test.utils.AdapterTestUtils.msgToString; import static foundation.pEp.jniadapter.test.utils.AdapterTestUtils.msgToString;
@ -45,7 +47,7 @@ class TestMain {
logH2("Verify msg2"); logH2("Verify msg2");
decrypt_message_Return result = null; decrypt_message_Return result = null;
result = ctx.engine.decrypt_message(msg2, ctx.vStr, 0); result = ctx.engine.decrypt_message(msg2, new Vector<String>(), 0);
log("\n" + msgToString(result.dst, false)); log("\n" + msgToString(result.dst, false));
}).run(); }).run();

10
test/java/foundation/pEp/jniadapter/test/utils/AdapterBaseTestContext.java

@ -59,14 +59,7 @@ public class AdapterBaseTestContext extends AbstractTestContext {
public Message msgToSelf; public Message msgToSelf;
public Message msgToBob; public Message msgToBob;
// Misc
public Vector<Identity> vID;
public Vector<String> vStr;
public void init() throws RuntimeException { public void init() throws RuntimeException {
vID = new Vector<Identity>();
vStr = new Vector<String>();
callbacks = new TestCallbacks(); callbacks = new TestCallbacks();
engine = new Engine(); engine = new Engine();
engine.setMessageToSendCallback(callbacks); engine.setMessageToSendCallback(callbacks);
@ -91,9 +84,6 @@ public class AdapterBaseTestContext extends AbstractTestContext {
msgToSelf = AdapterTestUtils.makeNewTestMessage(alice, alice, Message.Direction.Outgoing); msgToSelf = AdapterTestUtils.makeNewTestMessage(alice, alice, Message.Direction.Outgoing);
msgToBob = AdapterTestUtils.makeNewTestMessage(alice, bob, Message.Direction.Outgoing); msgToBob = AdapterTestUtils.makeNewTestMessage(alice, bob, Message.Direction.Outgoing);
vID.add(bob);
vStr.add("StringItem");
Path path; Path path;
path = Paths.get(filenameBobPub); path = Paths.get(filenameBobPub);
try { try {

6
test/java/foundation/pEp/pitytest/TestContextInterface.java

@ -2,10 +2,16 @@ package foundation.pEp.pitytest;
public interface TestContextInterface { public interface TestContextInterface {
void init() throws Throwable; void init() throws Throwable;
boolean isInitialized(); boolean isInitialized();
void setInitialized(boolean initialized); void setInitialized(boolean initialized);
boolean isUninitializable(); boolean isUninitializable();
void setUninitializable(boolean uninitializable); void setUninitializable(boolean uninitializable);
String getTestContextName(); String getTestContextName();
void setTestContextName(String name); void setTestContextName(String name);
} }

Loading…
Cancel
Save