- Added device identification on ping packet for Wondex protocol

- Store result of command execution to "result" field of position
- Fixed wrong class in WondexFrameDecoderTest

2 files changed, 17 insertions, 5 deletions

diff --git a/test/org/traccar/protocol/WondexFrameDecoderTest.java b/test/org/traccar/protocol/WondexFrameDecoderTest.java
index 5877452ed..fa95acb2b 100644
--- a/test/org/traccar/protocol/WondexFrameDecoderTest.java
+++ b/test/org/traccar/protocol/WondexFrameDecoderTest.java
@@ -9,15 +9,18 @@ public class WondexFrameDecoderTest extends ProtocolTest {
     @Test
     public void testDecode() throws Exception {
 
-        Pt502FrameDecoder decoder = new Pt502FrameDecoder();
+        WondexFrameDecoder decoder = new WondexFrameDecoder();
 
         Assert.assertNull(
-                decoder.decode(null, null, binary("d0d70b0001ca9a3b")));
+                decoder.decode(null, null, binary("f0d70b0001ca9a3b")));
 
         Assert.assertEquals(
                 binary("313034343938393630312c32303133303332333039353531352c31332e3537323737362c35322e3430303833382c302c3030302c37322c302c32"),
                 decoder.decode(null, null, binary("313034343938393630312c32303133303332333039353531352c31332e3537323737362c35322e3430303833382c302c3030302c37322c302c320d0a")));
 
+        Assert.assertEquals(binary("2449443a31303030303030303031"),
+                decoder.decode(null, null, binary("d0d70b0001ca9a3b")));
+
     }
 
 }
diff --git a/test/org/traccar/protocol/WondexProtocolDecoderTest.java b/test/org/traccar/protocol/WondexProtocolDecoderTest.java
index a44f7030f..2212cc216 100644
--- a/test/org/traccar/protocol/WondexProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/WondexProtocolDecoderTest.java
@@ -23,7 +23,7 @@ public class WondexProtocolDecoderTest extends ProtocolTest {
 
         verifyPosition(decoder, text(
                 "2000000259,20151030145653,69.380826,53.283890,9,10,15,2,1,695,1002.6,108.2,0.0"));
-        
+
         verifyPosition(decoder, text(
                 "1044989601,20130323074605,0.000000,90.000000,0,000,0,0,2"));
 
@@ -38,13 +38,22 @@ public class WondexProtocolDecoderTest extends ProtocolTest {
 
         verifyPosition(decoder, text(
                 "1044989601,20130322172647,13.572583,52.401070,22,204,-49,0,2"));
-        
+
         verifyPosition(decoder, text(
                 "3997324533,20140326074908,28.797603,47.041635,0,48,0,6,2,3.90V,0"));
-        
+
         verifyPosition(decoder, text(
                 "2000000001,20140529213210,-63.179111,9.781493,0,0,54.0,8,2,0.0,0,0.01,0.01,0,0,0,0"));
 
+        verifyNotNull(decoder, text(
+                "$OK:VER=M7 2.003 DVB rev02c,V2"));
+
+        verifyNotNull(decoder, text(
+                "$OK:REBOOT"));
+
+        verifyNotNull(decoder, text(
+                "$ERR:GETLOCATION=1"));
+
     }
 
 }