Implement custom marschal/unmarschal for LogItem, hopefully this will fix the problems.

1 files changed, 46 insertions, 8 deletions

diff --git a/main/src/test/java/de/blinkt/openvpn/core/TestLogFileHandler.java b/main/src/test/java/de/blinkt/openvpn/core/TestLogFileHandler.java
index f86dbcdc..c35df598 100644
--- a/main/src/test/java/de/blinkt/openvpn/core/TestLogFileHandler.java
+++ b/main/src/test/java/de/blinkt/openvpn/core/TestLogFileHandler.java
@@ -1,9 +1,6 @@
 package de.blinkt.openvpn.core;
 
 import android.annotation.SuppressLint;
-import android.os.Looper;
-import android.os.Message;
-import android.util.Log;
 
 import junit.framework.Assert;
 
@@ -15,19 +12,18 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.StringBufferInputStream;
+import java.io.UnsupportedEncodingException;
 import java.util.Arrays;
 
 public class TestLogFileHandler {
 
-    byte[] testUnescaped = new byte[] {0x00, 0x55, -27, 0x00, 0x56, 0x10, -128, 0x55, 0x54};
-    byte[] expectedEscaped = new byte[] {0x55, 0x00, 0x00, 0x00, 0x09, 0x00, 0x56, 0x00, -27, 0x00, 0x56, 0x01, 0x10, -128, 0x56, 0x00, 0x54};
+    byte[] testUnescaped = new byte[]{0x00, 0x55, -27, 0x00, 0x56, 0x10, -128, 0x55, 0x54};
+    byte[] expectedEscaped = new byte[]{0x55, 0x00, 0x00, 0x00, 0x09, 0x00, 0x56, 0x00, -27, 0x00, 0x56, 0x01, 0x10, -128, 0x56, 0x00, 0x54};
     private TestingLogFileHandler lfh;
 
 
     @Before
-    public void setup()
-    {
+    public void setup() {
         lfh = new TestingLogFileHandler();
     }
 
@@ -55,6 +51,46 @@ public class TestLogFileHandler {
 
     }
 
+    @Test
+    public void testMarschal() throws UnsupportedEncodingException {
+        LogItem li = new LogItem(VpnStatus.LogLevel.DEBUG, 72, "foobar");
+        LogItem li2 = marschalAndBack(li);
+        testEquals(li, li2);
+        Assert.assertEquals(li, li2);
+    }
+
+    @Test
+    public void testMarschalArgs() throws UnsupportedEncodingException {
+        LogItem li = new LogItem(VpnStatus.LogLevel.DEBUG, 72, 772, "sinnloser Text", 7723, 723.2f, 7.2);
+        LogItem li2 = marschalAndBack(li);
+        testEquals(li, li2);
+        Assert.assertEquals(li, li2);
+    }
+
+    @Test
+    public void testMarschalString() throws UnsupportedEncodingException {
+        LogItem li = new LogItem(VpnStatus.LogLevel.DEBUG, "Nutzlose Nachricht");
+        LogItem li2 = marschalAndBack(li);
+        testEquals(li, li2);
+        Assert.assertEquals(li, li2);
+    }
+
+
+    private void testEquals(LogItem li, LogItem li2) {
+        Assert.assertEquals(li.getLogLevel(), li2.getLogLevel());
+        Assert.assertEquals(li.getLogtime(), li2.getLogtime());
+        Assert.assertEquals(li.getVerbosityLevel(), li2.getVerbosityLevel());
+        Assert.assertEquals(li.toString(), li2.toString());
+
+    }
+
+    private LogItem marschalAndBack(LogItem li) throws UnsupportedEncodingException {
+        byte[] bytes = li.getMarschaledBytes();
+
+        return new LogItem(bytes, bytes.length);
+    }
+
+
     @SuppressLint("HandlerLeak")
     static class TestingLogFileHandler extends LogFileHandler {
 
@@ -78,4 +114,6 @@ public class TestLogFileHandler {
             mRestoredByteArray = Arrays.copyOf(buf, len);
         }
     }
+
+
 }
\ No newline at end of file