diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-08-04 00:39:09 +1200 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2017-08-04 00:39:09 +1200 |
commit | c6760e2ca84a0118c1439a6cbee0da42ed4a1c92 (patch) | |
tree | 2ae92b38b31b1dad81e20e0ad5474bf54377626d /test/org | |
parent | 4d35ef57f3dff21348d9ae9fe269176cd885c127 (diff) | |
download | traccar-server-c6760e2ca84a0118c1439a6cbee0da42ed4a1c92.tar.gz traccar-server-c6760e2ca84a0118c1439a6cbee0da42ed4a1c92.tar.bz2 traccar-server-c6760e2ca84a0118c1439a6cbee0da42ed4a1c92.zip |
Improve frame decoder testing
Diffstat (limited to 'test/org')
-rw-r--r-- | test/org/traccar/ProtocolTest.java | 10 | ||||
-rw-r--r-- | test/org/traccar/protocol/Vt200FrameDecoderTest.java | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/test/org/traccar/ProtocolTest.java b/test/org/traccar/ProtocolTest.java index 8a1602de7..daa495a17 100644 --- a/test/org/traccar/ProtocolTest.java +++ b/test/org/traccar/ProtocolTest.java @@ -270,14 +270,14 @@ public class ProtocolTest extends BaseTest { protected void verifyCommand( BaseProtocolEncoder encoder, Command command, ChannelBuffer expected) throws Exception { - verifyDecodedCommand(encoder.encodeCommand(command), expected); + verifyFrame(expected, encoder.encodeCommand(command)); } - private void verifyDecodedCommand(Object decodedObject, ChannelBuffer expected) { + protected void verifyFrame(ChannelBuffer expected, Object object) { - Assert.assertNotNull("command is null", decodedObject); - Assert.assertTrue("not a buffer", decodedObject instanceof ChannelBuffer); - Assert.assertEquals(ChannelBuffers.hexDump(expected), ChannelBuffers.hexDump((ChannelBuffer) decodedObject)); + Assert.assertNotNull("buffer is null", object); + Assert.assertTrue("not a buffer", object instanceof ChannelBuffer); + Assert.assertEquals(ChannelBuffers.hexDump(expected), ChannelBuffers.hexDump((ChannelBuffer) object)); } diff --git a/test/org/traccar/protocol/Vt200FrameDecoderTest.java b/test/org/traccar/protocol/Vt200FrameDecoderTest.java index b31e14b7d..a9fff6c33 100644 --- a/test/org/traccar/protocol/Vt200FrameDecoderTest.java +++ b/test/org/traccar/protocol/Vt200FrameDecoderTest.java @@ -11,11 +11,11 @@ public class Vt200FrameDecoderTest extends ProtocolTest { Vt200FrameDecoder decoder = new Vt200FrameDecoder(); - Assert.assertEquals( + verifyFrame( binary("28631037309456208400340102dc0906171616454415760201144494473f920a0c0000030500200100417c1f383a9d1090510000006a00007000000e00180ee129"), decoder.decode(null, null, binary("28631037309456208400340102dc0906171616454415760201144494473f920a0c0000030500200100417c1f383a9d1090510000006a00007000000e00180ee129"))); - Assert.assertEquals( + verifyFrame( binary("28631037309456208400340102f51306171327294418267501208948170231071f0000044300200100005f02180000667500000000000000000000080000624629"), decoder.decode(null, null, binary("28631037309456208400340102f513061713273d144418267501208948170231071f0000044300200100005f02180000667500000000000000000000080000624629"))); |