Merge pull request #3517 from naihil/adm

Improve ADM protocol

2 files changed, 45 insertions, 0 deletions

diff --git a/test/org/traccar/protocol/AdmProtocolDecoderTest.java b/test/org/traccar/protocol/AdmProtocolDecoderTest.java
index 4299001c3..9a7f91d26 100644
--- a/test/org/traccar/protocol/AdmProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/AdmProtocolDecoderTest.java
@@ -30,6 +30,8 @@ public class AdmProtocolDecoderTest extends ProtocolTest {
         verifyPosition(decoder, binary(ByteOrder.LITTLE_ENDIAN,
                 "01002200333508202000000000000000007F0D9F030000000000E39A1056E24A8210"));
 
+        verifyNotNull(decoder, binary(ByteOrder.LITTLE_ENDIAN,
+                "01008449443d3120536f66743d30783531204750533d313036382054696d653d30383a35393a32302031302e30392e31372056616c3d30204c61743d36312e36373738204c6f6e3d35302e3832343520563d3020536174436e743d342b3720537461743d30783030313020496e5f616c61726d3d30783030000000000000000000000000"));
     }
 
 }
diff --git a/test/org/traccar/protocol/AdmProtocolEncoderTest.java b/test/org/traccar/protocol/AdmProtocolEncoderTest.java
new file mode 100644
index 000000000..6d2452e26
--- /dev/null
+++ b/test/org/traccar/protocol/AdmProtocolEncoderTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 Anatoliy Golubev (darth.naihil@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+import org.traccar.model.Command;
+
+public class AdmProtocolEncoderTest extends ProtocolTest {
+
+    @Test
+    public void testEncode() throws Exception {
+
+        AdmProtocolEncoder encoder = new AdmProtocolEncoder();
+
+        Command command = new Command();
+        command.setDeviceId(1);
+        command.setType(Command.TYPE_GET_DEVICE_STATUS);
+        Assert.assertEquals("STATUS\r\n", encoder.encodeCommand(command));
+
+        command = new Command();
+        command.setDeviceId(1);
+        command.setType(Command.TYPE_CUSTOM);
+        command.set(Command.KEY_DATA, "INPUT 0");
+        Assert.assertEquals("INPUT 0\r\n", encoder.encodeCommand(command));
+    }
+
+}