two hop scenario works

Author: thsc42

src/net/sharksystem/asap/ASAPEngine.java

@@ -683,6 +683,7 @@ public void newEra() {
 
         if(this.contentChanged) {
             sb.append("content changed - increment era...");
+            System.out.println(sb.toString());
             try {
                 int oldEra = this.era;
                 int nextEra = this.getNextEra(this.era);
@@ -692,11 +693,10 @@ public void newEra() {
 
                 // we are done here - we are in a new era.
                 this.era = nextEra;
+
                 // persistent values
                 if(this.memento != null) this.memento.save(this);
 
-                // do some - probably time consuming stuff
-
                 // drop very very old chunks - if available
                 this.chunkStorage.dropChunks(nextEra);
 
@@ -706,8 +706,7 @@ public void newEra() {
                     copyChunk.clone(chunk);
                 }
 
-                sb.append(" done");
-                System.out.println(sb.toString());
+                System.out.println(this.getLogStart() + "era incremented");
             } catch (IOException ex) {
                 sb.append("IOException while incrementing era: ");
                 sb.append(ex.getLocalizedMessage());

src/net/sharksystem/asap/ASAPEngineFS.java

@@ -28,6 +28,10 @@ private ASAPEngineFS(String owner,
         this.rootDirectory = rootDirectory;
     }
 
+    public String getRootFolder() {
+        return this.rootDirectory;
+    }
+
     public String getOwner() {
         return this.owner;
     }
@@ -58,6 +62,7 @@ public static ASAPEngine getASAPEngine(String owner, String rootDirectory, CharS
     }
 
     public ASAPStorage refresh() throws IOException, ASAPException {
+        this.memento.save(this);
         return ASAPEngineFS.getExistingASAPEngineFS(this.rootDirectory);
     }
 

src/net/sharksystem/asap/ASAPMementoFS.java

@@ -2,12 +2,7 @@
 
 import net.sharksystem.asap.protocol.ASAP_1_0;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import java.io.*;
 import java.util.HashMap;
 
 /**
@@ -82,10 +77,18 @@ public void restore(ASAPEngine engine) throws IOException {
         engine.owner = dis.readUTF();
         engine.format = dis.readUTF();
         engine.era = dis.readInt();
-        engine.oldestEra = dis.readInt();
-        engine.contentChanged = dis.readBoolean();
-        engine.dropDeliveredChunks = dis.readBoolean();
-        engine.sendReceivedChunks = dis.readBoolean();
+
+        // from hereon optional values - could work with defaults
+        try {
+            engine.oldestEra = dis.readInt();
+            engine.contentChanged = dis.readBoolean();
+            engine.dropDeliveredChunks = dis.readBoolean();
+            engine.sendReceivedChunks = dis.readBoolean();
+        }
+        catch(EOFException e) {
+            // ignore and work with set defaults
+            return; // reached end of file - nothing to do here
+        }
 
         // try to read lastSeen list
         boolean first = true;

src/net/sharksystem/cmdline/CmdLineUI.java

@@ -428,13 +428,6 @@ public void doResetASAPStorages() {
         ASAPEngineFS.removeFolder("tests");
     }
 
-    public ASAPStorage getStorage(String storageName) throws ASAPException {
-        ASAPStorage asapStorage = this.storages.get(storageName);
-        if(asapStorage == null) throw new ASAPException("no such storage: " + storageName);
-
-        return asapStorage;
-    }
-
     public void doSetSendReceivedMessage(String parameterString) {
         StringTokenizer st = new StringTokenizer(parameterString);
 
@@ -452,11 +445,24 @@ public void doSetSendReceivedMessage(String parameterString) {
         }
     }
 
+    private ASAPStorage getStorage(String storageName) throws ASAPException {
+        ASAPStorage asapStorage = this.storages.get(storageName);
+        if(asapStorage == null) throw new ASAPException("no storage with name: " + storageName);
+
+        return asapStorage;
+    }
+
     private boolean parseOnOffValue(String onOff) throws ASAPException {
         if(onOff.equalsIgnoreCase("on")) return true;
         if(onOff.equalsIgnoreCase("off")) return false;
 
         throw new ASAPException("unexpected value; expected on or off, found: " + onOff);
 
     }
+
+    public String getEngineRootFolderByStorageName(String storageName) throws ASAPException {
+
+        ASAPEngineFS asapEngineFS = (ASAPEngineFS) this.getStorage(storageName);
+        return asapEngineFS.getRootFolder();
+    }
 }

test/net/sharksystem/asap/MultihopTests.java

@@ -29,8 +29,9 @@ public void twoHops() throws IOException, ASAPException, InterruptedException {
         ui.doSetSendReceivedMessage("Clara:twoHops on");
 
         // add message to alice storage
-        String messageAlice2Clara = "Alice twoHops abcChat HiClara";
-        ui.doCreateASAPMessage(messageAlice2Clara);
+        String messageAlice2Clara = "HiClara";
+        String parameters = "Alice twoHops abcChat " + messageAlice2Clara;
+        ui.doCreateASAPMessage(parameters);
 
         System.out.println("**************************************************************************");
         System.out.println("**                       connect Alice with Bob                         **");
@@ -44,12 +45,16 @@ public void twoHops() throws IOException, ASAPException, InterruptedException {
 
         ui.doConnect("7070 Bob");
 
+        // alice should be in era 1 (content has changed before connection) and bob era is 0 - no changes
+
         // wait a moment
         Thread.sleep(1000);
 
         // kill connections
         ui.doKill("all");
 
+        // alice should stay in era 1 (no content change), bob should be in era 1 received something
+
         // wait a moment
         Thread.sleep(1000);
 
@@ -62,16 +67,27 @@ public void twoHops() throws IOException, ASAPException, InterruptedException {
         Thread.sleep(10);
         ui.doConnect("8080 Bob");
 
+        // bob should remain in era 1 o changes, clara is era 0
+
         // wait a moment
         Thread.sleep(1000);
         // kill connections
         ui.doKill("all");
 
         // get Clara storage
-        ASAPStorage clara = ui.getStorage("Clara:twoHops");
+        String rootFolder = ui.getEngineRootFolderByStorageName("Clara:twoHops");
+        ASAPStorage clara = ASAPEngineFS.getExistingASAPEngineFS(rootFolder);
+
+        /* that asap message is from Bob even if it was created by Alice .. !!
+        apps on top of asap could and should deal differently with ownership of messages.
+        */
         ASAPChunkStorage claraBob = clara.getIncomingChunkStorage("Bob");
-        ASAPChunk claraABCChat = claraBob.getChunk("abcChat", clara.getEra());
+
+        // clara era was increased after connection terminated - message from bob is in era before current one
+        int eraToLook = ASAPEngine.previousEra(clara.getEra());
+        ASAPChunk claraABCChat = claraBob.getChunk("abcChat", eraToLook);
         CharSequence message = claraABCChat.getMessages().next();
-        Assert.assertTrue(message.toString().equalsIgnoreCase(messageAlice2Clara));
+        boolean same = messageAlice2Clara.equalsIgnoreCase(message.toString());
+        Assert.assertTrue(same);
     }
 }