Merge remote-tracking branch 'origin/master'

Author: thsc42

app/src/androidTest/java/net/sharksystem/asap/android/lora/BasicCommunicationTest.java

@@ -61,8 +61,10 @@ public static void setup() throws IOException, InterruptedException {
     }
 
     @AfterClass
-    public static void teardown() throws InterruptedException {
-        Thread.sleep(10000); //Give the BT Modules some time to stabilize
+    public static void teardown() throws InterruptedException, IOException {
+        BasicCommunicationTest.AliceSocket.close();
+        BasicCommunicationTest.BobSocket.close();
+        Thread.sleep(2000); //Give the BT Modules some time to stabilize
     }
     @Test
     public void usesAppContext() {

app/src/androidTest/java/net/sharksystem/asap/android/lora/LoRaASAPInputStreamTest.java

@@ -1,26 +1,15 @@
 package net.sharksystem.asap.android.lora;
 
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothSocket;
+
 import android.content.Context;
 
-import net.sharksystem.asap.android.lora.exceptions.ASAPLoRaMessageException;
-import net.sharksystem.asap.android.lora.messages.ASAPLoRaMessage;
-import net.sharksystem.asap.android.lora.messages.AbstractASAPLoRaMessage;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.MethodSorters;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.ByteBuffer;
-import java.util.UUID;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;

app/src/androidTest/java/net/sharksystem/asap/android/lora/LoRaBTInputOutputStreamTest.java

@@ -5,7 +5,6 @@
 import android.bluetooth.BluetoothSocket;
 import android.content.Context;
 
-import net.sharksystem.asap.android.lora.exceptions.ASAPLoRaException;
 import net.sharksystem.asap.android.lora.exceptions.ASAPLoRaMessageException;
 import net.sharksystem.asap.android.lora.messages.ASAPLoRaMessage;
 import net.sharksystem.asap.android.lora.messages.AbstractASAPLoRaMessage;
@@ -62,10 +61,10 @@ public static void setup() throws IOException, InterruptedException {
         AliceSocket.connect();
         BobSocket.connect();
 
-        Thread.sleep(2000); //Give the BT Modules some time to stabilize
 
         Alice = new LoRaBTInputOutputStream(AliceSocket);
         Bob = new LoRaBTInputOutputStream(BobSocket);
+        Thread.sleep(2000); //Give the BT Modules some time to stabilize
     }
 
     @AfterClass
@@ -94,19 +93,17 @@ public void testASAPOutputToBTInput() throws IOException, ASAPLoRaMessageExcepti
                 System.out.print("Test Device Response: ");
                 System.out.println(deviceResponse);
                 ASAPLoRaMessage asapMsg = (ASAPLoRaMessage) AbstractASAPLoRaMessage.createASAPLoRaMessage(deviceResponse);
-                assertEquals(new ASAPLoRaMessage("1000", "Test".getBytes()).toString(), asapMsg.toString());
+                ASAPLoRaMessage expectedMessage = new ASAPLoRaMessage("1000", "Test".getBytes());
+                System.out.print("Received Message: ");
+                System.out.println(asapMsg);
+                System.out.print("Expected Message: ");
+                System.out.println(expectedMessage);
+                assertEquals(expectedMessage.toString(), asapMsg.toString());
                 break;
             }
         }
     }
 
-    /*@Test(timeout = 100000)
-    public void testMultipleASAPOutputToBTInput() throws IOException, ASAPLoRaMessageException {
-        for (int i = 0; i < 10; i++) {
-            this.testASAPOutputToBTInput();
-        }
-    }*/
-
     @Test(timeout = 100000)
     public void testASAPOutputToBTInputLong() throws IOException, ASAPLoRaMessageException {
         Alice.getASAPOutputStream("1001").write(longString.getBytes());

app/src/androidTest/java/net/sharksystem/asap/android/lora/SimultaneousCommunicationTest.java

@@ -93,7 +93,7 @@ public void simultaneousMessageTest() throws IOException {
             }
         }
     }
-/*
+
     @Test(timeout = 240000)
     public void tenSimultaneousMessageTest() throws IOException {
         int rounds = 10;
@@ -130,7 +130,7 @@ public void tenSimultaneousMessageTest() throws IOException {
         assertEquals(rounds, AliceCounter);
         assertEquals(rounds, BobCounter);
     }
-*/
+
     @Test(timeout = 240000)
     public void tenSimultaneousOrderedMessageTest() throws IOException {
         int rounds = 10;

app/src/main/java/net/sharksystem/asap/android/lora/messages/ASAPLoRaMessage.java

@@ -34,7 +34,8 @@ public ASAPLoRaMessage(String address, byte[] message) throws ASAPLoRaMessageExc
             throw new ASAPLoRaMessageException("Passed a message that is too long for LoRa Transport");
         this.setAddress(address);
         this.message = message;
-        this.base64message = Base64.encodeToString(message, Base64.DEFAULT);
+        //NO_WRAP to stop the Base64 Util to terminate the string with a newline, as we add our own LF
+        this.base64message = Base64.encodeToString(message, Base64.NO_WRAP);
     }
 
     /**
@@ -46,7 +47,7 @@ public ASAPLoRaMessage(String address, byte[] message) throws ASAPLoRaMessageExc
      */
     public ASAPLoRaMessage(String address, String base64message) throws ASAPLoRaMessageException {
         this.setAddress(address);
-        this.base64message = base64message.trim(); //whitespaces are ignored, according to RFC2045
+        this.base64message = base64message.trim(); //whitespaces can be ignored, according to RFC2045
         this.message = Base64.decode(this.base64message, Base64.DEFAULT);
     }