From 772988f5570427c5f2ac066b683f3dabd990e1df Mon Sep 17 00:00:00 2001 From: Hussein Kasem Date: Fri, 30 Nov 2018 10:57:48 +0100 Subject: [PATCH] Adapt test to call callbacks... --- test/Makefile | 2 +- {src => test}/SyncCallbacks.java | 2 +- test/Testing.java | 10 +++++++++- 3 files changed, 11 insertions(+), 3 deletions(-) rename {src => test}/SyncCallbacks.java (92%) diff --git a/test/Makefile b/test/Makefile index 5d06bb5..47797c0 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,7 +1,7 @@ CLASSPATH=.:../src VM=java -Djava.library.path=../src -test: Testing.class +test: Testing.class SyncCallbacks.class CLASSPATH=$(CLASSPATH) $(VM) Testing %.class: %.java diff --git a/src/SyncCallbacks.java b/test/SyncCallbacks.java similarity index 92% rename from src/SyncCallbacks.java rename to test/SyncCallbacks.java index 8963b71..a5fc61c 100644 --- a/src/SyncCallbacks.java +++ b/test/SyncCallbacks.java @@ -1,6 +1,6 @@ import org.pEp.jniadapter.*; -class SyncCallbacks implements Sync.MessageToSendCallback, Sync.notifyHandshakeCallback { +class SyncCallbacks implements Sync.MessageToSendCallback, Sync.NotifyHandshakeCallback { public void messageToSend(Message message) { System.out.println(message.getFrom()); diff --git a/test/Testing.java b/test/Testing.java index ccbf966..970ff26 100644 --- a/test/Testing.java +++ b/test/Testing.java @@ -8,6 +8,9 @@ class Testing { // load try { e = new Engine(); + SyncCallbacks callbacks = new SyncCallbacks(); + e.setNotifyHandshakeCallback(callbacks); + e.setMessageToSendCallback(callbacks); } catch (pEpException ex) { System.out.println("Cannot load"); @@ -26,7 +29,7 @@ class Testing { System.out.print("Keys generated: "); System.out.println(user.fpr); - + // trustwords Identity vb = new Identity(); vb.fpr = "DB4713183660A12ABAFA7714EBE90D44146F62F4"; @@ -86,6 +89,11 @@ class Testing { System.out.println(result.dst.getShortmsg()); System.out.println(result.dst.getLongmsg()); + System.out.println("TEST DONE - FINISHED"); + System.exit(0); } + + + }