From da9e3571f686816c07159fb834ec8b9e6eaa3cda Mon Sep 17 00:00:00 2001
From: Evgeny S Maksimov <admin@vragam.net>
Date: Thu, 31 Jan 2019 12:57:36 +0300
Subject: Review fixes

---
 .../org/traccar/protocol/NavisFrameDecoderTest.java | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'test/org/traccar/protocol/NavisFrameDecoderTest.java')

diff --git a/test/org/traccar/protocol/NavisFrameDecoderTest.java b/test/org/traccar/protocol/NavisFrameDecoderTest.java
index 069f03d1b..5e8d8fd36 100644
--- a/test/org/traccar/protocol/NavisFrameDecoderTest.java
+++ b/test/org/traccar/protocol/NavisFrameDecoderTest.java
@@ -7,30 +7,33 @@ import org.junit.Test;
 public class NavisFrameDecoderTest extends ProtocolTest {
 
     @Test
-    public void testDecode() throws Exception {
+    public void testDecodeNtcb() throws Exception {
 
         NavisProtocolDecoder protocolDecoder = new NavisProtocolDecoder(null);
         NavisFrameDecoder frameDecoder = new NavisFrameDecoder(protocolDecoder);
 
-        // Handshake
-        verifyNull(protocolDecoder, binary(
-                "404E5443010000007B000000130044342A3E533A383631373835303035323035303739"));
-
-        // NTCB F5.2 - Single
         verifyFrame(binary(
                 "404e5443010000000000000059009adb2a3e54250000000000ff1500040b0a1008291838001200760ee600000000000000000000000f1500040b0a10ac20703fb1aec23f00000000320149668f430000000000000000000000000000000000000000000000f3808080"),
                 frameDecoder.decode(null, null, binary("404e5443010000000000000059009adb2a3e54250000000000ff1500040b0a1008291838001200760ee600000000000000000000000f1500040b0a10ac20703fb1aec23f00000000320149668f430000000000000000000000000000000000000000000000f3808080")));
 
-        // FLEX 1.0 - Negotiation
+    }
+
+    @Test
+    public void testDecodeFlex10() throws Exception {
+
+        NavisProtocolDecoder protocolDecoder = new NavisProtocolDecoder(null);
+        NavisFrameDecoder frameDecoder = new NavisFrameDecoder(protocolDecoder);
+
+        verifyNull(protocolDecoder, binary(
+                "404e544301000000c9b5f602130046c52a3e533a383639363936303439373232383235"));
+
         verifyNull(protocolDecoder, binary(
                 "404e544301000000aaecf6021300c8712a3e464c4558b00a0a45ffff300a08080f8388"));
 
-        // FLEX 1.0 - Single
         verifyFrame(binary(
                 "7e54040000000400000030129957405c000b00632f9857405ccace03021e129101a103000000000000c4005ba3fe3b00000000120046100000000000001aff7f000080bfffff80000080bfffffffff9f"),
                 frameDecoder.decode(null, null, binary("7e54040000000400000030129957405c000b00632f9857405ccace03021e129101a103000000000000c4005ba3fe3b00000000120046100000000000001aff7f000080bfffff80000080bfffffffff9f")));
 
-        // FLEX 1.0 - Array (1 message)
         verifyFrame(binary(
                 "7e4101080000000917c057405c002b001833c057405cbbce030225129101a00300007c6102408900400c1b3cfce3b23a12004710e000000000001bff7f000080bfffff80000080bfffffffffb2"),
                 frameDecoder.decode(null, null, binary("7e4101080000000917c057405c002b001833c057405cbbce030225129101a00300007c6102408900400c1b3cfce3b23a12004710e000000000001bff7f000080bfffff80000080bfffffffffb2")));
-- 
cgit v1.2.3