added connection establishment to asapJavaApp test - actual test are missing

Author: thsc42

src/net/sharksystem/asap/apps/ASAPJavaApplicationFS.java

@@ -36,8 +36,15 @@ private ASAPJavaApplicationFS(CharSequence owner, CharSequence rootFolder, Colle
 
     private MultiASAPEngineFS getMulitEngine() throws IOException, ASAPException {
         // TODO: re-create any time - keep track of potential changes in external storage (file system)?
-        return MultiASAPEngineFS_Impl.createMultiEngine(owner, rootFolder,
-                        MultiASAPEngineFS.DEFAULT_MAX_PROCESSING_TIME, null);
+        MultiASAPEngineFS multiEngine = MultiASAPEngineFS_Impl.createMultiEngine(owner, rootFolder,
+                MultiASAPEngineFS.DEFAULT_MAX_PROCESSING_TIME, null);
+
+        for(CharSequence format : this.messageReceivedListener.keySet()) {
+            ASAPMessageReceivedListener listener = this.messageReceivedListener.get(format);
+            multiEngine.setASAPChunkReceivedListener(format, new MessageChunkReceivedListenerWrapper(listener));
+        }
+
+        return multiEngine;
     }
 
     @Override
@@ -85,7 +92,7 @@ public void chunkReceived(String format, String sender, String uri, int era) {
             System.out.println(getLogStart() + "chunk received - convert to asap message received");
             try {
                 ASAPEngine engine = ASAPJavaApplicationFS.this.multiEngine.getEngineByFormat(format);
-                ASAPMessages messages = engine.getChannel(uri).getMessages();
+                ASAPMessages messages = engine.getIncomingChunkStorage(sender).getASAPChunkCache(uri, era);
                 this.listener.asapMessagesReceived(messages);
             } catch (ASAPException | IOException e) {
                 System.out.println(getLogStart() + e.getLocalizedMessage());

src/net/sharksystem/asap/protocol/ASAPPersistentConnection.java

@@ -211,51 +211,29 @@ public void run() {
                 System.out.println(this.getLogStart() + "read valid pdu");
                 this.setRemotePeer(asappdu.getPeer());
 
-                // process received pdu
-                boolean pduExecuted = false;
-                /*
-                if(asappdu.getFormat().equalsIgnoreCase(ASAP_1_0.ASAP_MANAGEMENT_FORMAT)) {
-                    System.out.println(this.getLogStart()
-                            + "got asap management message - let multi-engine handle this one");
-
+                try {
+                    this.executor = new ASAPPDUExecutor(asappdu,
+                                        this.is, this.os,
+                                        this.multiASAPEngineFS.getEngineSettings(asappdu.getFormat()),
+                                        protocol,this);
+
+                    // get exclusive access to streams
+                    System.out.println(this.getLogStart() + "asap pdu executor going to wait for stream access");
+                    this.wait4ExclusiveStreamsAccess();
                     try {
-                        // if return true - message was handled. No further actions required
-                        pduExecuted = this.multiASAPEngineFS.handleASAPManagementPDU(asappdu, protocol, is);
-                    } catch (ASAPException e) {
-                        System.err.println("asap management pdu processing failed - go ahead in read/process loop: "
-                                + e.getLocalizedMessage());
-                        pduExecuted = false; // failed to execute - forget and go ahead
-                    } catch (IOException e) {
-                        this.terminate("asap management pdu processing failed", e);
+                        System.out.println(this.getLogStart() + "asap pdu executor got stream access - process pdu");
+                        this.runObservedThread(executor, maxExecutionTime);
+                    } catch (ASAPExecTimeExceededException e) {
+                        System.out.println(this.getLogStart() + "asap pdu processing took longer than allowed");
+                        this.terminate("asap pdu processing took longer than allowed", e);
                         break;
+                    } finally {
+                        // wake waiting thread if any
+                        this.releaseStreamsLock();
+                        System.out.println(this.getLogStart() + "asap pdu executor release locks");
                     }
-                }
-                */
-                if(!pduExecuted) { // not (completely executed by multi engine
-                    try {
-                        this.executor = new ASAPPDUExecutor(asappdu,
-                                            this.is, this.os,
-                                            this.multiASAPEngineFS.getEngineSettings(asappdu.getFormat()),
-                                            protocol,this);
-
-                        // get exclusive access to streams
-                        System.out.println(this.getLogStart() + "asap pdu executor going to wait for stream access");
-                        this.wait4ExclusiveStreamsAccess();
-                        try {
-                            System.out.println(this.getLogStart() + "asap pdu executor got stream access - process pdu");
-                            this.runObservedThread(executor, maxExecutionTime);
-                        } catch (ASAPExecTimeExceededException e) {
-                            System.out.println(this.getLogStart() + "asap pdu processing took longer than allowed");
-                            this.terminate("asap pdu processing took longer than allowed", e);
-                            break;
-                        } finally {
-                            // wake waiting thread if any
-                            this.releaseStreamsLock();
-                            System.out.println(this.getLogStart() + "asap pdu executor release locks");
-                        }
-                    } catch (ASAPException e) {
-                        System.out.println(this.getLogStart() + " problem when executing asap received pdu: " + e);
-                    }
+                } catch (ASAPException e) {
+                    System.out.println(this.getLogStart() + " problem when executing asap received pdu: " + e);
                 }
             }
         }

test/net/sharksystem/asap/ASAPJavaApplicationTests.java

@@ -3,6 +3,7 @@
 import net.sharksystem.asap.apps.*;
 import net.sharksystem.asap.util.ASAPEngineThread;
 import net.sharksystem.cmdline.TCPChannel;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -12,14 +13,16 @@
 public class ASAPJavaApplicationTests {
     public static final String ALICE = "Alice";
     public static final String BOB = "Bob";
-    public static final String ALICE_ROOT_FOLDER = "tests/Alice";
-    public static final String BOB_ROOT_FOLDER = "tests/Bob";
+    public static final String TESTS_ROOT_FOLDER = "tests/";
+    public static final String ALICE_ROOT_FOLDER = TESTS_ROOT_FOLDER + "Alice";
+    public static final String BOB_ROOT_FOLDER = TESTS_ROOT_FOLDER + "Bob";
     private static final CharSequence APP_FORMAT = "TEST_FORMAT";
     private static final byte[] TESTMESSAGE = "TestMessage".getBytes();
     private static final int PORT = 7777;
 
     @Test
     public void usageTest() throws IOException, ASAPException, InterruptedException {
+        ASAPEngineFS.removeFolder(TESTS_ROOT_FOLDER);
         Collection<CharSequence> formats = new HashSet<>();
         formats.add(APP_FORMAT);
 
@@ -40,7 +43,8 @@ public void usageTest() throws IOException, ASAPException, InterruptedException
         ASAPJavaApplication asapJavaApplicationBob =
                 ASAPJavaApplicationFS.createASAPJavaApplication(BOB, BOB_ROOT_FOLDER, formats);
 
-        asapJavaApplicationBob.setASAPMessageReceivedListener(APP_FORMAT, new ListenerExample());
+        ListenerExample listenerBob = new ListenerExample();
+        asapJavaApplicationBob.setASAPMessageReceivedListener(APP_FORMAT, listenerBob);
 
         // create connections for both sides
         TCPChannel aliceChannel = new TCPChannel(PORT, true, "a2b");
@@ -86,18 +90,26 @@ public void usageTest() throws IOException, ASAPException, InterruptedException
         //                                            test results                                       //
         ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-        // TODO: should test something
+        // received?
+        Assert.assertTrue(listenerBob.hasReceivedMessage());
     }
 
     private class ListenerExample implements ASAPMessageReceivedListener {
 
+        private boolean hasReceivedMessage = false;
+
         @Override
         public void asapMessagesReceived(ASAPMessages messages) {
             try {
                 System.out.println("#message == " + messages.size());
+                this.hasReceivedMessage = true;
             } catch (IOException e) {
                 // do something with it.
             }
         }
+
+        public boolean hasReceivedMessage() {
+            return this.hasReceivedMessage;
+        }
     }
 }