Implement custom Watch frame decoder

2 files changed, 25 insertions, 1 deletions

diff --git a/test/org/traccar/protocol/WatchFrameDecoderTest.java b/test/org/traccar/protocol/WatchFrameDecoderTest.java
new file mode 100644
index 000000000..c705b24b3
--- /dev/null
+++ b/test/org/traccar/protocol/WatchFrameDecoderTest.java
@@ -0,0 +1,24 @@
+package org.traccar.protocol;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class WatchFrameDecoderTest extends ProtocolTest {
+
+    @Test
+    public void testDecode() throws Exception {
+
+        WatchFrameDecoder decoder = new WatchFrameDecoder();
+
+        Assert.assertEquals(
+                binary("5b33472a383330383430363237392a303030382a72636170747572655d"),
+                decoder.decode(null, null, binary("5b33472a383330383430363237392a303030382a72636170747572655d")));
+
+        Assert.assertEquals(
+                binary("5b33472a383330383430363237392a303030392a4c4b2c302c302c38345d"),
+                decoder.decode(null, null, binary("5b33472a383330383430363237392a303030392a4c4b2c302c302c38345d")));
+
+    }
+
+}
diff --git a/test/org/traccar/protocol/WatchProtocolDecoderTest.java b/test/org/traccar/protocol/WatchProtocolDecoderTest.java
index f624988d4..0961dcd50 100644
--- a/test/org/traccar/protocol/WatchProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/WatchProtocolDecoderTest.java
@@ -45,7 +45,7 @@ public class WatchProtocolDecoderTest extends ProtocolTest {
                 "[3G*2256002206*0079*UD2,100116,153723,A,38.000000,N,-9.000000,W,0.44,299.3,0.0,7,100,86,0,0,00000008,2,0,268,3,3010,51042,146,3010,51043,132]"));
 
         verifyNull(decoder, text(
-                "[3G*8800000015*0003*TKQ"));
+                "[3G*8800000015*0003*TKQ]"));
 
         verifyPosition(decoder, text(
                 "[3G*4700186508*00B1*UD,301015,084840,V,45.853100,N,14.6224899,E,0.00,0.0,0.0,0,84,61,0,11,00000008,7,255,293,70,60,6453,139,60,6432,139,60,6431,132,60,6457,127,60,16353,126,60,6451,121,60,16352,118]"));