Merge tananaev/master

Conflicts:
	src/org/traccar/web/WebServer.java

1 files changed, 20 insertions, 0 deletions

diff --git a/test/org/traccar/protocol/UlbotechFrameDecoderTest.java b/test/org/traccar/protocol/UlbotechFrameDecoderTest.java
new file mode 100644
index 000000000..76e4f799d
--- /dev/null
+++ b/test/org/traccar/protocol/UlbotechFrameDecoderTest.java
@@ -0,0 +1,20 @@
+package org.traccar.protocol;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.traccar.ProtocolDecoderTest;
+
+public class UlbotechFrameDecoderTest extends ProtocolDecoderTest {
+
+    @Test
+    public void testDecode() throws Exception {
+
+        UlbotechFrameDecoder decoder = new UlbotechFrameDecoder();
+
+        Assert.assertEquals(
+                binary("f8010108679650230646339de69054010e015ee17506bde2c60000000000ac0304024000000404000009f705060390181422170711310583410c0000310d00312f834131018608040003130a100101136cf8"),
+                decoder.decode(null, null, binary("f8010108679650230646339de69054010e015ee17506bde2c60000000000ac0304024000000404000009f70005060390181422170711310583410c0000310d00312f834131018608040003130a100101136cf8")));
+
+    }
+
+}