working on multihop scenarios

Author: thsc42

src/net/sharksystem/cmdline/CmdLineUI.java

@@ -26,6 +26,13 @@ public class CmdLineUI {
     private final PrintStream consoleOutput;
     private final BufferedReader userInput;
 
+    public static final String TESTS_ROOT_FOLDER = "tests";
+    private Map<String, MultiASAPEngineFS> engines = new HashMap();
+    private String getStorageKey(String owner, String appName) {
+        return owner + ":" + appName;
+    }
+    private Map<String, ASAPStorage> storages = new HashMap();
+
     public static void main(String[] args) {
         PrintStream os = System.out;
 
@@ -41,6 +48,11 @@ public CmdLineUI(PrintStream os, InputStream is) {
         this.userInput = new BufferedReader(new InputStreamReader(is));
     }
 
+    public CmdLineUI(PrintStream out) {
+        this.consoleOutput = out;
+        this.userInput = null;
+    }
+
     public void printUsage() {
         StringBuilder b = new StringBuilder();
 
@@ -186,7 +198,7 @@ public void runCommandLoop() {
                     case CREATE_ASAP_MESSAGE:
                         this.doCreateASAPMessage(parameterString); break;
                     case RESET_ASAP_STORAGES:
-                        ASAPEngineFS.removeFolder("tests"); break;
+                        this.doResetASAPStorages(); break;
                     case "q": // convenience
                     case EXIT:
                         this.doKill("all");
@@ -223,7 +235,11 @@ private void startChannel(String name, TCPChannel channel, String engineName) th
         this.channels.put(name, channel);
     }
 
-    private void doConnect(String parameterString) {
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////
+    //                                           method implementations                                   //
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    public void doConnect(String parameterString) {
         StringTokenizer st = new StringTokenizer(parameterString);
 
         try {
@@ -251,7 +267,7 @@ private void doConnect(String parameterString) {
         }
     }
 
-    private void doOpen(String parameterString) {
+    public void doOpen(String parameterString) {
         StringTokenizer st = new StringTokenizer(parameterString);
 
         try {
@@ -270,7 +286,7 @@ private void doOpen(String parameterString) {
         }
     }
 
-    private void doList() {
+    public void doList() {
         System.out.println("connections:");
         for(String connectionName : this.channels.keySet()) {
             System.out.println(connectionName);
@@ -285,7 +301,7 @@ private void doList() {
         }
     }
 
-    private void doKill(String parameterString) {
+    public void doKill(String parameterString) {
         StringTokenizer st = new StringTokenizer(parameterString);
 
         try {
@@ -315,7 +331,7 @@ private void doKill(String parameterString) {
         }
     }
 
-    private void doSetWaiting(String parameterString) {
+    public void doSetWaiting(String parameterString) {
         StringTokenizer st = new StringTokenizer(parameterString);
 
         try {
@@ -328,9 +344,7 @@ private void doSetWaiting(String parameterString) {
         }
     }
 
-    public static final String TESTS_ROOT_FOLDER = "tests";
-    private Map<String, MultiASAPEngineFS> engines = new HashMap();
-    private void doCreateASAPMultiEngine(String parameterString) {
+    public void doCreateASAPMultiEngine(String parameterString) {
         StringTokenizer st = new StringTokenizer(parameterString);
 
         try {
@@ -348,12 +362,7 @@ private void doCreateASAPMultiEngine(String parameterString) {
         }
     }
 
-    private String getStorageKey(String owner, String appName) {
-        return owner + ":" + appName;
-    }
-
-    private Map<String, ASAPStorage> storages = new HashMap();
-    private void doCreateASAPStorage(String parameterString) {
+    public void doCreateASAPStorage(String parameterString) {
         StringTokenizer st = new StringTokenizer(parameterString);
 
         try {
@@ -374,7 +383,7 @@ private void doCreateASAPStorage(String parameterString) {
         }
     }
 
-    private void doCreateASAPMessage(String parameterString) {
+    public void doCreateASAPMessage(String parameterString) {
         StringTokenizer st = new StringTokenizer(parameterString);
 
         try {
@@ -397,5 +406,12 @@ private void doCreateASAPMessage(String parameterString) {
             this.printUsage(CREATE_ASAP_MESSAGE, e.getLocalizedMessage());
         }
     }
-}
 
+    public void doResetASAPStorages() {
+        ASAPEngineFS.removeFolder("tests");
+    }
+
+    public ASAPStorage getStorage(String storageName) {
+        return this.storages.get(storageName);
+    }
+}

test/net/sharksystem/asap/CommunicationTests.java

@@ -6,6 +6,7 @@
 
 import net.sharksystem.asap.util.ASAPChunkReceivedTester;
 import net.sharksystem.asap.util.ASAPEngineThread;
+import net.sharksystem.cmdline.CmdLineUI;
 import net.sharksystem.cmdline.TCPChannel;
 import org.junit.Test;
 import org.junit.Assert;
@@ -521,5 +522,4 @@ public void killOpenConnection() throws IOException, ASAPException, InterruptedE
 
         // check results
     }
-
 }

test/net/sharksystem/asap/MultihopTests.java

@@ -0,0 +1,53 @@
+package net.sharksystem.asap;
+
+import net.sharksystem.cmdline.CmdLineUI;
+import org.junit.Test;
+
+import java.io.IOException;
+
+public class MultihopTests {
+    /**
+     * Create three storages and engine and let hop one message from a to c
+     * @throws IOException
+     * @throws ASAPException
+     * @throws InterruptedException
+     */
+    @Test
+    public void twoHops() throws IOException, ASAPException, InterruptedException {
+        CmdLineUI ui = new CmdLineUI(System.out);
+
+        ui.doResetASAPStorages();
+
+        // create storages
+        ui.doCreateASAPStorage("Alice twoHops");
+        ui.doCreateASAPStorage("Bob twoHops");
+        ui.doCreateASAPStorage("Clara twoHops");
+
+        // add message to alice storage
+        ui.doCreateASAPMessage("Alice twoHops abcChat HiClara");
+
+        // connect alice with bob
+        ui.doCreateASAPMultiEngine("Alice");
+        ui.doOpen("7070 Alice");
+        ui.doCreateASAPMultiEngine("Bob");
+        ui.doConnect("7070 Bob");
+
+        // wait a moment
+        Thread.sleep(1000);
+
+        // kill connections
+        ui.doKill("all");
+
+        ui.doCreateASAPMultiEngine("Clara");
+        ui.doOpen("7070 Clara");
+        ui.doConnect("7070 Bob");
+
+        // wait a moment
+        Thread.sleep(1000);
+
+        // get Clara storage
+        ASAPStorage clara = ui.getStorage("Clara");
+        ASAPChunkStorage claraBob = clara.getIncomingChunkStorage("Bob");
+        claraBob.getChunk("abcChat", clara.getEra() - 1);
+    }
+}