bug fix- thanks for telling and implementing the bug report.

Author: thsc42

pom.xml

@@ -47,6 +47,12 @@
             <artifactId>jaxb-impl</artifactId>
             <version>3.0.2</version>
         </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-suite-api</artifactId>
+            <version>1.8.1</version>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 

src/main/java/net/sharksystem/asap/engine/ASAPEngine.java

@@ -754,7 +754,6 @@ private void sendChunks(CharSequence sender, String encounteredPeer, ASAPChunkSt
 
         boolean lastRound = false; // assume more than one round
         do {
-            boolean goAhead = true; // to avoid deep if-if-if-if structures
             lastRound = workingEra == lastEra;
 
             List<ASAPInternalChunk> chunks = chunkStorage.getChunks(workingEra);
@@ -767,16 +766,19 @@ private void sendChunks(CharSequence sender, String encounteredPeer, ASAPChunkSt
             //>>>>>>>>>>>>>>>>>>>debug
 
             for(ASAPInternalChunk chunk : chunks) {
+                boolean goAhead = true; // to avoid deep if-if-if-if structures
+
                 //<<<<<<<<<<<<<<<<<<debug
                 b = new StringBuilder();
-                b.append(this.getLogStart());
                 b.append("chunkUrl: ");
                 b.append(chunk.getUri());
                 b.append(" | isPublic: ");
                 b.append(this.isPublic(chunk));
                 b.append(" | len: ");
                 b.append(chunk.getLength());
-                System.out.println(b.toString());
+                b.append(" | recipients: ");
+                b.append(chunk.getRecipients());
+                Log.writeLog(this, this.owner, b.toString());
                 //>>>>>>>>>>>>>>>>>>>debug
 
                 if(chunk.getLength() < 1) {

src/test/java/bugreports/BugReportASAPPeerFS.java renamed to src/test/java/junit5Tests/release_1/MultipleEncounterTests.java

@@ -1,4 +1,4 @@
-package bugreports;
+package junit5Tests.release_1;
 
 import net.sharksystem.TestConstants;
 import net.sharksystem.TestHelper;
@@ -16,8 +16,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
-public class BugReportASAPPeerFS {
-    private static final String TEST_FOLDER = "SemanticTests";
+public class MultipleEncounterTests {
+    private static final String TEST_FOLDER = "MultipleEncounterTests";
     public static final String ANIMAL = "animal";
     public static final String WATER = "water";
     public static final String ICE_CREAM = "ice_cream";
@@ -43,7 +43,7 @@ public class BugReportASAPPeerFS {
     private static int port = 0;
 
     /* clear folder before launching tests */
-    public BugReportASAPPeerFS() {
+    public MultipleEncounterTests() {
         ASAPEngineFS.removeFolder(TEST_FOLDER);
     }
 
@@ -155,10 +155,10 @@ public void multiEncounter_sameURIs() throws InterruptedException, IOException,
     @Test
     public void multiEncounter_partiallyDifferentURIs() throws InterruptedException, IOException, ASAPException {
         // sending different uris back and forth now breaks it
-        simpleEncounterWithMessageExchange(TIGER_URI, ICE_CREAM);
-        simpleEncounterWithMessageExchange(ICE_CREAM, ELEPHANT_URI);
-        simpleEncounterWithMessageExchange(HELLO_URI, ICE_CREAM);
-        simpleEncounterWithMessageExchange(ICE_CREAM, HELLO_URI);
+        simpleEncounterWithMessageExchange(TIGER_URI, ICE_CREAM, 1);
+        simpleEncounterWithMessageExchange(ICE_CREAM, ELEPHANT_URI, 2);
+        simpleEncounterWithMessageExchange(HELLO_URI, ICE_CREAM, 3);
+        simpleEncounterWithMessageExchange(ICE_CREAM, HELLO_URI, 4);
 
         int era = 0;
         // encounter #1: Alice (TIGER_URI) < - > Bob (ICE_CREAM)
@@ -216,7 +216,7 @@ public void multiEncounter_completelyDifferentURIs() throws InterruptedException
 
         // run encounter
         for(int i = 0; i < numberEncounter; i++) {
-            simpleEncounterWithMessageExchange(exchangedUris[i][0], exchangedUris[i][1]);
+            simpleEncounterWithMessageExchange(exchangedUris[i][0], exchangedUris[i][1], i);
         }
 
         // test
@@ -247,13 +247,19 @@ public void multiEncounter_completelyDifferentURIs() throws InterruptedException
          */
     }
 
+    public void simpleEncounterWithMessageExchange(String uriAlice, String uriBob)
+            throws IOException, ASAPException, InterruptedException {
+        this.simpleEncounterWithMessageExchange(uriAlice, uriBob, 0);
+    }
+
+
     // sends messages with given uri, starts and then stops the encounter
     // message content is irrelevant, we don't test for it
-    public void simpleEncounterWithMessageExchange(String uriAlice, String uriBob)
+    public void simpleEncounterWithMessageExchange(String uriAlice, String uriBob, int encounterNumber)
             throws IOException, ASAPException, InterruptedException {
 
         // simulate ASAP first encounter with full ASAP protocol stack and engines
-        System.out.println("+++++++++++++++++++ 1st encounter starts soon ++++++++++++++++++++");
+        System.out.println("+++++++++++++++++++ encounter #" + encounterNumber + " starts soon ++++++++++++++++++++");
         Thread.sleep(50);
 
         // setup message received listener - this should be replaced with your code - you implement a listener.

src/test/java/net/sharksystem/TestConstants.java

@@ -1,7 +1,7 @@
 package net.sharksystem;
 
 public interface TestConstants {
-    String ROOT_DIRECTORY = "playground/";
+    String ROOT_DIRECTORY = "testResultsRootFolder/";
     String ALICE_ID = "Alice_42";
     String ALICE_NAME = "Alice";
     String BOB_ID = "Bob_43";

src/test/java/net/sharksystem/TestHelper.java

@@ -12,14 +12,13 @@ public static int getPortNumber() {
 
     public static String getFullTempFolderName(String fullRootFolderName, boolean increment) {
 //        String retVal = fullRootFolderName + "_" + testNumber;
-        String retVal = fullRootFolderName + "/test_" + testNumber;
+        String retVal = TestConstants.ROOT_DIRECTORY + "/" + fullRootFolderName + "/test_" + testNumber;
         if(increment) testNumber++;
         return retVal;
     }
 
     public static String getFullRootFolderName(String peerID, Class testClass) {
-        return TestConstants.ROOT_DIRECTORY
-                + testClass.getSimpleName()
+        return testClass.getSimpleName()
                 + "/"
                 + peerID;
     }

src/test/java/net/sharksystem/V1TestSuite.java

@@ -1,6 +1,7 @@
 package net.sharksystem;
 
 import net.sharksystem.asap.crypto.CryptoUsage;
+import junit5Tests.release_1.MultipleEncounterTests;
 import net.sharksystem.asap.engine.*;
 import net.sharksystem.asap.helper.HelperTester;
 import net.sharksystem.asap.protocol.PDUTests;
@@ -22,7 +23,8 @@
         CryptoUsage.class,
         HelperTester.class,
         MultihopTests.class,
-        CommandlineTests.class
+        CommandlineTests.class,
+        MultipleEncounterTests.class
         //E2EStreamPairLinkTestVersion2.class TODO
 })
 public class V1TestSuite {

src/test/java/net/sharksystem/asap/engine/CryptoTests.java

@@ -1,5 +1,6 @@
 package net.sharksystem.asap.engine;
 
+import net.sharksystem.TestConstants;
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.engine.ASAPEngine;
 import net.sharksystem.asap.engine.ASAPEngineFS;
@@ -15,7 +16,7 @@
 import java.util.List;
 
 public class CryptoTests {
-    public static final String WORKING_SUB_DIRECTORY = "cryptoTests/";
+    public static final String WORKING_SUB_DIRECTORY = TestConstants.ROOT_DIRECTORY + "cryptoTests/";
     public static final String ALICE_PEER_NAME = "Alice";
     public static final String BOB_PEER_NAME = "Bob";
     public static final String CLARA_PEER_NAME = "Clara";

src/test/java/net/sharksystem/asap/engine/LongerMessages.java

@@ -1,5 +1,6 @@
 package net.sharksystem.asap.engine;
 
+import net.sharksystem.TestConstants;
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.ASAPChunkStorage;
 import net.sharksystem.asap.engine.*;
@@ -20,12 +21,14 @@
 public class LongerMessages {
     public static final String ALICE_BOB_CHAT_URL = "content://aliceAndBob.talk";
     public static final String CHAT_FORMAT = "application/x-sn2-makan";
-    public static final String ALICE_ROOT_FOLDER = "longmessage/Alice";
-    public static final String ALICE_APP_FOLDER = ALICE_ROOT_FOLDER + "/appFolder";
-    public static final String BOB_ROOT_FOLDER = "longmessage/Bob";
+    public static String ALICE_ROOT_FOLDER = TestConstants.ROOT_DIRECTORY + "longmessage/Alice";
+    public static String ALICE_APP_FOLDER = ALICE_ROOT_FOLDER + "/appFolder";
+    public static final String BOB_ROOT_FOLDER = TestConstants.ROOT_DIRECTORY + "longmessage/Bob";
     public static final String BOB_APP_FOLDER = BOB_ROOT_FOLDER + "/appFolder";
     public static final String ALICE = "Alice";
     public static final String BOB = "Bob";
+
+
     // 200
     public static final String ALICE2BOB_MESSAGE = "11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111";
     //public static final String ALICE2BOB_MESSAGE = "Hi Bob";