repaired some obvious error in tests

Author: thsc42

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

@@ -13,7 +13,7 @@
  * Descriptions of ASAP protocol data units and some constants
  */
 public interface ASAP_1_0 {
-    int CMD_MASK = 0x6; // 0110
+    int CMD_MASK = 0x7; // 0111
     byte OFFER_CMD = 0;
     byte INTEREST_CMD = 2;
     byte ASSIMILATE_CMD = 4;

test/net/sharksystem/asap/MultihopTests.java

@@ -20,6 +20,10 @@ public void twoHops() throws IOException, ASAPException, InterruptedException {
 
         ui.doResetASAPStorages();
 
+        ui.doCreateASAPPeer("Alice");
+        ui.doCreateASAPPeer("Bob");
+        ui.doCreateASAPPeer("Clara");
+
         // create storages
         ui.doCreateASAPApp("Alice twoHops");
         ui.doCreateASAPApp("Bob twoHops");
@@ -42,11 +46,9 @@ public void twoHops() throws IOException, ASAPException, InterruptedException {
         System.out.println("**                       connect Alice with Bob                         **");
         System.out.println("**************************************************************************");
         // connect alice with bob
-        ui.doCreateASAPPeer("Alice");
         ui.doOpen("7070 Alice");
         // wait a moment to give server socket time to be created
         Thread.sleep(10);
-        ui.doCreateASAPPeer("Bob");
 
         ui.doConnect("7070 Bob");
 
@@ -66,7 +68,6 @@ public void twoHops() throws IOException, ASAPException, InterruptedException {
         System.out.println("**************************************************************************");
         System.out.println("**                       connect Bob with Clara                         **");
         System.out.println("**************************************************************************");
-        ui.doCreateASAPPeer("Clara");
         ui.doOpen("8080 Clara");
         // wait a moment to give server socket time to be created
         Thread.sleep(10);
@@ -135,6 +136,11 @@ public void closedChannelTest() throws IOException, ASAPException, InterruptedEx
         CmdLineUI ui = new CmdLineUI(System.out);
         ui.doResetASAPStorages();
 
+        ui.doCreateASAPPeer("Alice");
+        ui.doCreateASAPPeer("Bob");
+        ui.doCreateASAPPeer("Clara");
+        ui.doCreateASAPPeer("David");
+
         // create app on each peer
         ui.doCreateASAPApp("Alice chat");
         ui.doCreateASAPApp("Bob chat");
@@ -164,11 +170,9 @@ public void closedChannelTest() throws IOException, ASAPException, InterruptedEx
         System.out.println("**                       connect Alice with Bob                         **");
         System.out.println("**************************************************************************");
         // connect alice with bob
-        ui.doCreateASAPPeer("Alice");
         ui.doOpen("7070 Alice");
         // wait a moment to give server socket time to be created
         Thread.sleep(10);
-        ui.doCreateASAPPeer("Bob");
         ui.doConnect("7070 Bob");
 
         // alice should be in era 1 (content has changed before connection) and bob era is 0 - no changes
@@ -214,11 +218,9 @@ public void closedChannelTest() throws IOException, ASAPException, InterruptedEx
         System.out.println("**                       connect Bob with Clara                         **");
         System.out.println("**************************************************************************");
         // connect alice with bob
-        ui.doCreateASAPPeer("Bob");
         ui.doOpen("7071 Bob");
         // wait a moment to give server socket time to be created
         Thread.sleep(10);
-        ui.doCreateASAPPeer("Clara");
         ui.doConnect("7071 Clara");
 
         // alice should be in era 1 (content has changed before connection) and bob era is 0 - no changes
@@ -264,11 +266,9 @@ public void closedChannelTest() throws IOException, ASAPException, InterruptedEx
         System.out.println("**                       connect Clara with David                       **");
         System.out.println("**************************************************************************");
         // connect alice with bob
-        ui.doCreateASAPPeer("Clara");
         ui.doOpen("7072 Clara");
         // wait a moment to give server socket time to be created
         Thread.sleep(10);
-        ui.doCreateASAPPeer("David");
         ui.doConnect("7072 David");
 
         // wait a moment