Merge remote-tracking branch 'refs/remotes/tananaev/master'

# Conflicts:
#	web/app/view/LoginController.js

1 files changed, 22 insertions, 0 deletions

diff --git a/test/org/traccar/protocol/ObdDongleProtocolDecoderTest.java b/test/org/traccar/protocol/ObdDongleProtocolDecoderTest.java
new file mode 100644
index 000000000..19e3a4ff2
--- /dev/null
+++ b/test/org/traccar/protocol/ObdDongleProtocolDecoderTest.java
@@ -0,0 +1,22 @@
+package org.traccar.protocol;
+
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class ObdDongleProtocolDecoderTest extends ProtocolTest {
+
+    @Test
+    public void testDecode() throws Exception {
+
+        ObdDongleProtocolDecoder decoder = new ObdDongleProtocolDecoder(new ObdDongleProtocol());
+
+        verifyNothing(decoder, binary(
+                "55550003383634383637303232353131303135010009010011023402010201ABAAAA"));
+
+        verifyPosition(decoder, binary(
+                "5555000338363438363730323235313130313503000100010355AABBCC184F1ABC614E21C1FA08712A84ABAAAA"),
+                position("2015-07-18 20:49:16.000", true, 22.12346, -123.45678));
+
+    }
+
+}