Implement Cityeasy protocol commands

3 files changed, 42 insertions, 16 deletions

diff --git a/test/org/traccar/helper/ChecksumTest.java b/test/org/traccar/helper/ChecksumTest.java
new file mode 100644
index 000000000..c87692ce8
--- /dev/null
+++ b/test/org/traccar/helper/ChecksumTest.java
@@ -0,0 +1,16 @@
+package org.traccar.helper;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ChecksumTest {
+    
+    @Test
+    public void testLuhnChecksum() {
+
+        Assert.assertEquals(7, Checksum.luhnChecksum(12345678901234L));
+        Assert.assertEquals(0, Checksum.luhnChecksum(63070019470771L));
+
+    }
+
+}
diff --git a/test/org/traccar/helper/CrcTest.java b/test/org/traccar/helper/CrcTest.java
deleted file mode 100644
index 7bd4a0482..000000000
--- a/test/org/traccar/helper/CrcTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.traccar.helper;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class CrcTest {
-    
-    @Test
-    public void testLuhnChecksum() {
-
-        Assert.assertEquals(7, Crc.luhnChecksum(12345678901234L));
-        Assert.assertEquals(0, Crc.luhnChecksum(63070019470771L));
-
-    }
-
-}
diff --git a/test/org/traccar/protocol/CityeasyProtocolEncoderTest.java b/test/org/traccar/protocol/CityeasyProtocolEncoderTest.java
new file mode 100644
index 000000000..4d94e9c69
--- /dev/null
+++ b/test/org/traccar/protocol/CityeasyProtocolEncoderTest.java
@@ -0,0 +1,26 @@
+package org.traccar.protocol;
+
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.junit.Assert;
+import org.junit.Test;
+import org.traccar.helper.ChannelBufferTools;
+import org.traccar.model.Command;
+
+public class CityeasyProtocolEncoderTest {
+
+    @Test
+    public void testEncode() throws Exception {
+
+        CityeasyProtocolEncoder encoder = new CityeasyProtocolEncoder();
+        
+        Command command = new Command();
+        command.setDeviceId(1);
+        command.setType(Command.TYPE_SET_TIMEZONE);
+        command.set(Command.KEY_TIMEZONE, 6 * 3600);
+
+        Assert.assertEquals(encoder.encodeCommand(command), ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString(
+                "5353001100080001680000000B60820D0A")));
+
+    }
+
+}