diff options
80 files changed, 215 insertions, 210 deletions
diff --git a/test/org/traccar/ProtocolTest.java b/test/org/traccar/ProtocolTest.java index 465a3496d..1725e31be 100644 --- a/test/org/traccar/ProtocolTest.java +++ b/test/org/traccar/ProtocolTest.java @@ -82,7 +82,7 @@ public class ProtocolTest extends BaseTest { Assert.assertNotNull(decoder.decode(null, null, object)); } - protected void verifyNothing(BaseProtocolDecoder decoder, Object object) throws Exception { + protected void verifyNull(BaseProtocolDecoder decoder, Object object) throws Exception { Assert.assertNull(decoder.decode(null, null, object)); } diff --git a/test/org/traccar/protocol/AdmProtocolDecoderTest.java b/test/org/traccar/protocol/AdmProtocolDecoderTest.java index 587486dfa..4299001c3 100644 --- a/test/org/traccar/protocol/AdmProtocolDecoderTest.java +++ b/test/org/traccar/protocol/AdmProtocolDecoderTest.java @@ -12,7 +12,7 @@ public class AdmProtocolDecoderTest extends ProtocolTest { AdmProtocolDecoder decoder = new AdmProtocolDecoder(new AdmProtocol()); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "010042033836313331313030323639343838320501000000000000000000000000000000000000000000000000000000000000000000000000000000000000000073")); verifyPosition(decoder, binary(ByteOrder.LITTLE_ENDIAN, diff --git a/test/org/traccar/protocol/ApelProtocolDecoderTest.java b/test/org/traccar/protocol/ApelProtocolDecoderTest.java index ffb4b9c17..1d0a7e344 100644 --- a/test/org/traccar/protocol/ApelProtocolDecoderTest.java +++ b/test/org/traccar/protocol/ApelProtocolDecoderTest.java @@ -11,7 +11,7 @@ public class ApelProtocolDecoderTest extends ProtocolTest { ApelProtocolDecoder decoder = new ApelProtocolDecoder(new ApelProtocol()); /*byte[] buf1 = {0x40,0x4E,0x54,0x43,0x01,0x00,0x00,0x00,0x7B,0x00,0x00,0x00,0x13,0x00,0x44,0x34,0x2A,0x3E,0x53,0x3A,0x38,0x36,0x31,0x37,0x38,0x35,0x30,0x30,0x35,0x32,0x30,0x35,0x30,0x37,0x39}; - verifyNothing(decoder, text( ChannelBuffers.wrappedBuffer(ByteOrder.LITTLE_ENDIAN, buf1)));*/ + verifyNull(decoder, text( ChannelBuffers.wrappedBuffer(ByteOrder.LITTLE_ENDIAN, buf1)));*/ //0c002900f12a00000f003235303032363533343135313036340f0033353638393530333632373938313101002000000000 //5c00380046e6a95136b693277f11b41a00172709f2ff03160002b9bc630007000000000000000000000000000000c31071090000880500000000000000000000 diff --git a/test/org/traccar/protocol/AquilaProtocolDecoderTest.java b/test/org/traccar/protocol/AquilaProtocolDecoderTest.java index de50176ae..a2ef966c2 100644 --- a/test/org/traccar/protocol/AquilaProtocolDecoderTest.java +++ b/test/org/traccar/protocol/AquilaProtocolDecoderTest.java @@ -13,7 +13,7 @@ public class AquilaProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "$$CLIENT_1ZF,170222318,101,22.846016,75.949104,170321103506,A,0,0,244991,0,10,0.860000,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,12483,294,*3D")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$$CLIENT_1ZF,170222318,15,2_00AP,70.35.195.185,5089,internet,T1:10 S,T2:1 M,Ad1:9164061023,Ad2:9164061023,TOF:0 S,,OSC:75 KM,OST:0 S,GPS:YES,Ignition:ON,*75")); verifyPosition(decoder, text( @@ -28,7 +28,7 @@ public class AquilaProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "$$CLIENT_1DT,151028368,1,19.108438,72.925308,160628154920,A,22,0,0,131,3503,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,*1D")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$$CLIENT_1DT,160319372,1,28.549541,77.249802,160628140743,A,23,0,-65025,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,*0D")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/ArknavX8ProtocolDecoderTest.java b/test/org/traccar/protocol/ArknavX8ProtocolDecoderTest.java index c5e99f60b..1cb1bdcfe 100644 --- a/test/org/traccar/protocol/ArknavX8ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/ArknavX8ProtocolDecoderTest.java @@ -10,19 +10,19 @@ public class ArknavX8ProtocolDecoderTest extends ProtocolTest { ArknavX8ProtocolDecoder decoder = new ArknavX8ProtocolDecoder(new ArknavX8Protocol()); - verifyNothing(decoder, text( + verifyNull(decoder, text( "351856045213782,241111")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "2R,090214235955,00,,00.04,03.76,001892024.9")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "351856040005407,240101")); verifyPosition(decoder, text( "1R,110509053244,A,2457.9141N,12126.3321E,220.0,315,10.0,00000000")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "2R,110509053244,837493,,998372,,,")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/At2000ProtocolDecoderTest.java b/test/org/traccar/protocol/At2000ProtocolDecoderTest.java index 0b1a9f471..532baa764 100644 --- a/test/org/traccar/protocol/At2000ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/At2000ProtocolDecoderTest.java @@ -18,15 +18,15 @@ public class At2000ProtocolDecoderTest extends ProtocolTest { decoder = new At2000ProtocolDecoder(new At2000Protocol()); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "01012f00000000000000000000000000003335373435343037313632373539388b57ec3a6ec7e3310a1ceb0a70fd751b8f2e7be6df1d6dcd80129f66fff0ea1c")); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "89000000000000000000000000000000")); decoder = new At2000ProtocolDecoder(new At2000Protocol()); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "01012f0000000000000000000000000000333537343534303731363036313936ddf189075add9a32d97b54073025963e65849a3a59940d05fd8db655fc84bc6d")); verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN, @@ -34,7 +34,7 @@ public class At2000ProtocolDecoderTest extends ProtocolTest { decoder = new At2000ProtocolDecoder(new At2000Protocol()); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "01012f000000000000000000000000000033353734353430373136303631393637f5441a9862260117858237fe3160388490f0df7d46c09112ee087235a92101")); verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN, @@ -42,7 +42,7 @@ public class At2000ProtocolDecoderTest extends ProtocolTest { decoder = new At2000ProtocolDecoder(new At2000Protocol()); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "01012f0000000000000000000000000000333537343534303731363035353033dd529a1eb5df9f3b6d320b38250e03306692957e8c2127d8e381a717f639b4c9")); verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN, @@ -50,7 +50,7 @@ public class At2000ProtocolDecoderTest extends ProtocolTest { decoder = new At2000ProtocolDecoder(new At2000Protocol()); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "01012f00000000000000000000000000003335363137333036343430373439320fad981997ae8e031fe10c0ea7641903ca32c0331df467233d2a9cd886fbeef8")); verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN, diff --git a/test/org/traccar/protocol/AtrackProtocolDecoderTest.java b/test/org/traccar/protocol/AtrackProtocolDecoderTest.java index 904f9570b..93d8db09b 100644 --- a/test/org/traccar/protocol/AtrackProtocolDecoderTest.java +++ b/test/org/traccar/protocol/AtrackProtocolDecoderTest.java @@ -24,7 +24,7 @@ public class AtrackProtocolDecoderTest extends ProtocolTest { decoder.setCustom(false); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "fe0200014104d8f196820001")); verifyPositions(decoder, binary( diff --git a/test/org/traccar/protocol/AutoFonProtocolDecoderTest.java b/test/org/traccar/protocol/AutoFonProtocolDecoderTest.java index a229695a2..e4d9e44d2 100644 --- a/test/org/traccar/protocol/AutoFonProtocolDecoderTest.java +++ b/test/org/traccar/protocol/AutoFonProtocolDecoderTest.java @@ -11,7 +11,7 @@ public class AutoFonProtocolDecoderTest extends ProtocolTest { AutoFonProtocolDecoder decoder = new AutoFonProtocolDecoder(new AutoFonProtocol());
- verifyNothing(decoder, binary(
+ verifyNull(decoder, binary(
"10556103592310314825728F"));
verifyPosition(decoder, binary(
@@ -23,10 +23,10 @@ public class AutoFonProtocolDecoderTest extends ProtocolTest { //verifyPosition(decoder, binary(
// "12060000007501010B0C00089CFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000003E7FFFF02007601010B0C00269CFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000003E7FFFF4A007601010B0C01089CFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000003E7FFFF04007501010B0C01269CFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000003E7FFFF80007601010B0C02089CFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000003E7FFFFA6007501010B0C02231F5600FA000176F218C70000000000000000000000000000000000000003E7FFFF9629"));
- verifyNothing(decoder, binary(
+ verifyNull(decoder, binary(
"41035151305289931441139602662095148807"));
- verifyNothing(decoder, binary(
+ verifyNull(decoder, binary(
"41032125656985547543619173484002123481"));
verifyPosition(decoder, binary(
diff --git a/test/org/traccar/protocol/Avl301ProtocolDecoderTest.java b/test/org/traccar/protocol/Avl301ProtocolDecoderTest.java index 9a849a7e2..c7a568277 100644 --- a/test/org/traccar/protocol/Avl301ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Avl301ProtocolDecoderTest.java @@ -11,10 +11,10 @@ public class Avl301ProtocolDecoderTest extends ProtocolTest { Avl301ProtocolDecoder decoder = new Avl301ProtocolDecoder(new Avl301Protocol()); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "244c0f086058500087335500010d0a")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "24480d1001c3065c0d00010d0a")); verifyPosition(decoder, binary( diff --git a/test/org/traccar/protocol/BlackKiteProtocolDecoderTest.java b/test/org/traccar/protocol/BlackKiteProtocolDecoderTest.java index 727e85b37..503f51f3a 100644 --- a/test/org/traccar/protocol/BlackKiteProtocolDecoderTest.java +++ b/test/org/traccar/protocol/BlackKiteProtocolDecoderTest.java @@ -12,7 +12,7 @@ public class BlackKiteProtocolDecoderTest extends ProtocolTest { BlackKiteProtocolDecoder decoder = new BlackKiteProtocolDecoder(new BlackKiteProtocol()); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "01150003313131313131313131313131313131209836055605BA")); verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN, diff --git a/test/org/traccar/protocol/BoxProtocolDecoderTest.java b/test/org/traccar/protocol/BoxProtocolDecoderTest.java index 58ddc74ac..9f702bbf5 100644 --- a/test/org/traccar/protocol/BoxProtocolDecoderTest.java +++ b/test/org/traccar/protocol/BoxProtocolDecoderTest.java @@ -11,10 +11,10 @@ public class BoxProtocolDecoderTest extends ProtocolTest { BoxProtocolDecoder decoder = new BoxProtocolDecoder(new BoxProtocol()); - verifyNothing(decoder, text( + verifyNull(decoder, text( "H,BT,358281002435893,081028142432,F5813D19,6D6E6DC2")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "H,BT,N878123,080415081234,D63E6DD9,6D6E6DC2,8944100300825505377")); verifyPosition(decoder, text( @@ -23,10 +23,10 @@ public class BoxProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "L,081028142432,G,52.51081,-1.70849,0,203,0,16,0")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "L,080528112501,AI1,145.56")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "E,1")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/CalAmpProtocolDecoderTest.java b/test/org/traccar/protocol/CalAmpProtocolDecoderTest.java index b6fb5bd0e..bf0fcf41c 100644 --- a/test/org/traccar/protocol/CalAmpProtocolDecoderTest.java +++ b/test/org/traccar/protocol/CalAmpProtocolDecoderTest.java @@ -31,7 +31,7 @@ public class CalAmpProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, binary( "830543321494860101010a0c215608b6680ead5ada1bed88d300000049801f000500000300003cf33200000000000000008b0ce101")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "830545321041830101010300010000333862000023c301000000004532104183ffffff353816051610691f420040163953294fffffffffffffffff8996604211639032949f4f54413a317c303b302c317c343b302c34004f5441535441543a302c302c302c302c302c222200564255533a342c322e302e302c343533323130343138332c5630312e30332e30312e34302c5630312e30332e30312e33312c2c0056494e2d494e464f3a56494e3d31464d5a5537324539355a4137303032362c4445562d5245474e3d55532c535256522d5245474e3d555300")); verifyPosition(decoder, binary( diff --git a/test/org/traccar/protocol/CarTrackProtocolDecoderTest.java b/test/org/traccar/protocol/CarTrackProtocolDecoderTest.java index abf645e42..391d5734d 100644 --- a/test/org/traccar/protocol/CarTrackProtocolDecoderTest.java +++ b/test/org/traccar/protocol/CarTrackProtocolDecoderTest.java @@ -10,7 +10,7 @@ public class CarTrackProtocolDecoderTest extends ProtocolTest { CarTrackProtocolDecoder decoder = new CarTrackProtocolDecoder(new CarTrackProtocol()); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$$020040????????&A0000")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/CarscopProtocolDecoderTest.java b/test/org/traccar/protocol/CarscopProtocolDecoderTest.java index ab64ddd3c..da3ac510f 100644 --- a/test/org/traccar/protocol/CarscopProtocolDecoderTest.java +++ b/test/org/traccar/protocol/CarscopProtocolDecoderTest.java @@ -10,13 +10,13 @@ public class CarscopProtocolDecoderTest extends ProtocolTest { CarscopProtocolDecoder decoder = new CarscopProtocolDecoder(new CarscopProtocol()); - verifyNothing(decoder, text( + verifyNull(decoder, text( "*160618233129UB00HSO")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "*160618232614UD00232614A5009.1747N01910.3829E0.000160618298.2811000000L000000")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "*160618232529UB05CW9999C00000538232529A5009.1747N01910.3829E0.000160618298.2811000000L000000")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/CastelProtocolDecoderTest.java b/test/org/traccar/protocol/CastelProtocolDecoderTest.java index 4ecb263ba..bbc5f1f37 100644 --- a/test/org/traccar/protocol/CastelProtocolDecoderTest.java +++ b/test/org/traccar/protocol/CastelProtocolDecoderTest.java @@ -15,25 +15,25 @@ public class CastelProtocolDecoderTest extends ProtocolTest { verifyAttributes(decoder, binary(ByteOrder.LITTLE_ENDIAN, "404043000432313345503230313630303035383500000000004006a2021d5810031d58ae940400da050000f6040000070000000400076401680000000001001bd20d0a")); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "4040d0000432313345503230313630303035383500000000001001831c1c58b1fc1c58ae94040012220000f60400005800000000000763016800008484004944445f3231335730315f532056312e302e37004944445f3231335730315f482056312e302e370032000110021003100410051006100710081009100a100b100c100d100e1011100111021103110411051106110711011202120312041201130213031301160216011701180218011b011c011d011e011f021f031f041f051f061f071f0121022101260127012861780d0a")); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "404029000432313345503230313630303035383500000000009001ffffffff0000b4fc1c582b6e0d0a")); verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN, "40406000043231334550323031363030303538350000000000400708000000831c1c58f4fb1c58ae94040012220000f604000058000000200007630168000084c401040b10090c3532db3f07f07f7520090100000101010e00000000c7920d0a")); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "404042000432313345503230313630303035383500000000001002831c1c58b7fc1c58ae94040012220000f604000058000000000007630168000084840072a20d0a")); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "4040d0000432313345503230313630303035383500000000001001831c1c5805fe1c58ae94040012220000f60400005800000000000763016800008484004944445f3231335730315f532056312e302e37004944445f3231335730315f482056312e302e370032000110021003100410051006100710081009100a100b100c100d100e1011100111021103110411051106110711011202120312041201130213031301160216011701180218011b011c011d011e011f021f031f041f051f061f071f012102210126012701284eb10d0a")); verifyAttributes(decoder, binary(ByteOrder.LITTLE_ENDIAN, "40405700043231334e583230313630303131373700000000004002c458ce572159ce57a9e2020082030000500c00000f0000000400036401240e0403023c000505210c210d210f21102101075b14030121330269430d0a")); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "40407800043231334e583230313630303131373700000000004004fa52ce574b53ce57cad1020041020000050c00000d0000000400036401240b0503001b042105210c210d210f211021112113211c211f212121232124212c212d213021312133213e2141214221452149214a214c214f215021384e0d0a")); verifyAttributes(decoder, binary(ByteOrder.LITTLE_ENDIAN, @@ -45,7 +45,7 @@ public class CastelProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, binary(ByteOrder.LITTLE_ENDIAN, "40403600043231334e583230313630303033343600000000004009ad31a457050810061a35b29bf80ae6da83180300320bbe32580d0a40403600043231334e583230313630303033343600000000004009ad31a457050810061a35b29bf80ae6da83180300320bbe32580d0a")); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "4040d400043535333133350000000000000000000000000000100196d499574bd899570000000000000000010000000000000000000000002410000000004944445f3231334730325f532056322e332e345f4e004944445f3231334730325f482056322e332e345f4e0032000110021003100410051006100710081009100a100b100c100d100e1011100111021103110411051106110711011202120312041201130213031301160216011701180218011b011c011d011e011f021f031f041f051f061f071f012102210126012701285b410d0a")); verifyPosition(decoder, binary(ByteOrder.LITTLE_ENDIAN, @@ -78,7 +78,7 @@ public class CastelProtocolDecoderTest extends ProtocolTest { verifyAttributes(decoder, binary(ByteOrder.LITTLE_ENDIAN, "404043000431303031313132353239393837000000000000004006C1F0695209F169529C91110000000000698300000D0000000400036401014C00030000009AF40D0A")); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "404086000431303031313132353239393837000000000000004004C1F0695200F169529C91110000000000698300000D0000000400036401014C00030022032104210521062107210C210D210E210F2110211121132115211C211F21212124212E212F2130213121322133213C214221432144214521472149214A214C214D214E219AE90D0A")); verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN, @@ -93,22 +93,22 @@ public class CastelProtocolDecoderTest extends ProtocolTest { verifyAttributes(decoder, binary(ByteOrder.LITTLE_ENDIAN, "4040450004323132474c31313433303035303033000000000040082ca89b55a6a99b555c57000000000000c40200000b0000001400036401111f000302f5533bd653f10d0a")); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "40404d0004323132474c3131343330303530303300000000004007120000002ca89b55cba99b555c57000000000000c40200000b0000000000036401111f000102000101170000000068850d0a")); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "4040420004323132474c31313433303035303033000000000010022ca89b55cca99b555c57000000000000cf0200000b0000000000036401111f0000020013be0d0a")); verifyAttributes(decoder, binary(ByteOrder.LITTLE_ENDIAN, "4040870004323132474c31313433303035303033000000000040052ca89b55e3a89b555c57000000000000c4020000040000001400036401111f0003000012042105210b210c210d210f211021112113211c2121212321242133213421422146214f212b50663603003ce9030dff060000600dffffc25865ffff9e02b43624000000003cbc0d0a")); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "4040d00004323132474c31313433303035303033000000000010013ec09b5596c29b555c57000000000000de0200000f0000000000036401111f000000004944445f3231334730325f532056322e322e36004944445f3231334730325f482056322e322e360032000110021003100410051006100710081009100a100b100c100d100e1011100111021103110411051106110711011202120312041201130213031301160216011701180218011b011c011d011e011f021f031f041f051f061f071f012102210126012701288a690d0a")); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "40404d0004323132474c3131343330303530303300000000004007050000003ec09b5564c29b555c57000000000000de0200000f0000002000036401111f0000020001010e00000000237e0d0a")); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "40401F00043130303131313235323939383700000000000000100303320D0A")); verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN, diff --git a/test/org/traccar/protocol/CguardProtocolDecoderTest.java b/test/org/traccar/protocol/CguardProtocolDecoderTest.java index 3a3aa2332..17ea253cb 100644 --- a/test/org/traccar/protocol/CguardProtocolDecoderTest.java +++ b/test/org/traccar/protocol/CguardProtocolDecoderTest.java @@ -10,7 +10,7 @@ public class CguardProtocolDecoderTest extends ProtocolTest { CguardProtocolDecoder decoder = new CguardProtocolDecoder(new CguardProtocol()); - verifyNothing(decoder, text( + verifyNull(decoder, text( "IDRO:354868050655283")); verifyPosition(decoder, text( @@ -40,7 +40,7 @@ public class CguardProtocolDecoderTest extends ProtocolTest { verifyAttributes(decoder, text( "BC:160711 044524:CSQ1:61:NSQ1:18:BAT1:98:PWR1:11.7:CLG1:NAN")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "VERSION:3.3")); verifyPosition(decoder, text( @@ -61,7 +61,7 @@ public class CguardProtocolDecoderTest extends ProtocolTest { verifyAttributes(decoder, text( "BC:160630 153543:NSQ2:0")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "PING")); } diff --git a/test/org/traccar/protocol/CityeasyProtocolDecoderTest.java b/test/org/traccar/protocol/CityeasyProtocolDecoderTest.java index e5a571386..b7125ca15 100644 --- a/test/org/traccar/protocol/CityeasyProtocolDecoderTest.java +++ b/test/org/traccar/protocol/CityeasyProtocolDecoderTest.java @@ -14,16 +14,16 @@ public class CityeasyProtocolDecoderTest extends ProtocolTest { verifyNotNull(decoder, binary( "545400853575570249020100033b3430342c34352c31303638312c31313632312c33352c31303638312c31313632322c32332c31303638312c32383938332c32332c31303638312c31313632332c32312c31303638312c32333338312c31372c31303638312c32323538332c31372c31303638312c32363434312c31330000000d352e0d0a")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "54540019357557024902010002520704100000000bbe700d0a")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "5454001735755702490201434a01000000000c24280d0a")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "545400153520000000000100010000000111000D0A")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "54540019357557024902000002520704300000000376390d0a")); verifyPosition(decoder, binary( diff --git a/test/org/traccar/protocol/DmtProtocolDecoderTest.java b/test/org/traccar/protocol/DmtProtocolDecoderTest.java index cb48bf799..3a2bf28f1 100644 --- a/test/org/traccar/protocol/DmtProtocolDecoderTest.java +++ b/test/org/traccar/protocol/DmtProtocolDecoderTest.java @@ -12,16 +12,16 @@ public class DmtProtocolDecoderTest extends ProtocolTest { DmtProtocolDecoder decoder = new DmtProtocolDecoder(new DmtProtocol()); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "025500310038f90100333533333233303831363639373330003839363130313835303031383234383434363330002202010900000000")); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "0255220000")); verifyPositions(decoder, false, binary(ByteOrder.LITTLE_ENDIAN, "025504e9032f000d000000000000001501222700524553455420446172742033342e322e312e3920666c6167733d312057443d303f000e0000000000000015013214004e6f2041646d696e20706172616d7320666f756e64202d207573696e672064656661756c7473202b204175746f41504e37000f00000000000000090015000000000000000000000000000000000000000000020805000000000007000609012b1002400003700e37001000000000000000090015000000000000000000000000000000000000000000020801000000000007000609012b1002400003700e37001100000000000000090015000000000000000000000000000000000000000000020800000000000007000609012b1002400003700e37001200000000000000020015000000000000000000000000000000000000000000020800000000000006000609012b1002400003700e370013000000000000000f001500000000000000000000000000000000000000000002080000000000000200060901271002370003670e2e0014000000000000001501211300526f6c6c20646574656374656420636f735e32203c203338333535333838343700150000000000000017001500000000000000000000000000000000000000000002080000000000000200060901071002300003d60e2a00160000000000000015011d130054756d626c65722074726967676572656420636f735e32203c20302e0017000000000000001501211300526f6c6c20646574656374656420636f735e32203c203338333535333838343700180000000000000017001500000000000000000000000000000000000000000002080000000000000200060901071002300003f70e2a00190000000000000015011d130054756d626c65722074726967676572656420636f735e32203c203026001a000000000000001501190b0047534d3a20544350206261642053594e432063686172732e001b000000000000001501211300526f6c6c20646574656374656420636f735e32203c203338333535333838343a001c0000000000000017001500000000000000000000000000000000000000000002080000000000000200060c01c90f02300003e20f041f002a001d0000000000000015011d130054756d626c65722074726967676572656420636f735e32203c20302e001e000000000000001501211300526f6c6c20646574656374656420636f735e32203c203338333535333838343a001f0000000000000017001500000000000000000000000000000000000000000002080000000000000200060c01d80f02300003ff0f0418002a00200000000000000015011d130054756d626c65722074726967676572656420636f735e32203c2030")); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "025500310038f90100333533333233303831363639373330003839363130313435363839393333303030303835002202010900000000")); verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN, diff --git a/test/org/traccar/protocol/EasyTrackProtocolDecoderTest.java b/test/org/traccar/protocol/EasyTrackProtocolDecoderTest.java index 51c515544..653c605e0 100644 --- a/test/org/traccar/protocol/EasyTrackProtocolDecoderTest.java +++ b/test/org/traccar/protocol/EasyTrackProtocolDecoderTest.java @@ -13,23 +13,23 @@ public class EasyTrackProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "*ET,358155100054249,HB,A,100b06,053318,803a0b51,03d507c9,0017,0000,00400000,07,100,0000,1435,63")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "*ET,358155100054249,MQ")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "*ET,358155100054249,TX,A,100b06,053230")); verifyPosition(decoder, text( "*ET,358155100054249,HB,A,100b06,053212,803a0b20,03d507a2,0054,0000,40400000,06,100,0000,1435,44")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "*ET,135790246811221,GZ,0001,0005")); verifyPosition(decoder, text( "*ET,135790246811221,DW,A,0A090D,101C0D,00CF27C6,0413FA4E,0000,0000,00000000,20,4,0000,00F123"), position("2010-09-13 16:28:13.000", true, 22.62689, 114.03021)); - verifyNothing(decoder, text( + verifyNull(decoder, text( "*ET,358155100048430,CC,0.0,V,100603,141817,80d77ae8,81ab1ffd,0000,6b08,40000000,19,99,0000,fa9,918")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/EelinkProtocolDecoderTest.java b/test/org/traccar/protocol/EelinkProtocolDecoderTest.java index fd21d4713..c85167793 100644 --- a/test/org/traccar/protocol/EelinkProtocolDecoderTest.java +++ b/test/org/traccar/protocol/EelinkProtocolDecoderTest.java @@ -10,7 +10,7 @@ public class EelinkProtocolDecoderTest extends ProtocolTest { EelinkProtocolDecoder decoder = new EelinkProtocolDecoder(new EelinkProtocol()); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "676701000c007b03525440717505180104")); verifyPosition(decoder, binary( @@ -25,7 +25,7 @@ public class EelinkProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, binary( "676714002b00515784cc24130246479b07d05a06001800010000060195039f046100002cc52f6466b391604a49020089")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "676701000c002603541880486128290120")); verifyPosition(decoder, binary( @@ -40,13 +40,13 @@ public class EelinkProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, binary( "676704001c00b7569fc3020517a2d7020b08e100000000d8001e005b0004460004")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "676701000b001b035418804661834901")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "6767030004001A0001")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "6767070088001050E2281400FFFFFFFF02334455660333445566043344556605AA00000007334455660A334455660B334455660C4E2000000DAA0000000E334455660F3344556610AAAA000011334455661C334455661F334455662133445566423344556646334455664D334455665C334455665E33445566880000000089000000008A000000008B00000000")); verifyPosition(decoder, binary( diff --git a/test/org/traccar/protocol/EnforaProtocolDecoderTest.java b/test/org/traccar/protocol/EnforaProtocolDecoderTest.java index f247a0470..88c42fb80 100644 --- a/test/org/traccar/protocol/EnforaProtocolDecoderTest.java +++ b/test/org/traccar/protocol/EnforaProtocolDecoderTest.java @@ -10,10 +10,10 @@ public class EnforaProtocolDecoderTest extends ProtocolTest { EnforaProtocolDecoder decoder = new EnforaProtocolDecoder(new EnforaProtocol()); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "000A08002020202020303131303730303030353730323637")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "003B000502000000000820202020202030313130373030303035373032363720383A000000000D00508401358E640032B37700000367B00000A804")); verifyPosition(decoder, binary( diff --git a/test/org/traccar/protocol/ExtremTracProtocolDecoderTest.java b/test/org/traccar/protocol/ExtremTracProtocolDecoderTest.java index afcefb843..93f39cd1c 100644 --- a/test/org/traccar/protocol/ExtremTracProtocolDecoderTest.java +++ b/test/org/traccar/protocol/ExtremTracProtocolDecoderTest.java @@ -19,13 +19,13 @@ public class ExtremTracProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "$GPRMC,00000000000,092244.000,A,0000.0000,S,00000.0000,E,0.00,0.00,101016,0,,8000,0")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$GPRMC,092313.299,A,2238.8947,N,11355.2253,E,0.00,311.19,010307,0,,1111,1111")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$GPRMC,092313.299,A,2238.8947,N,11355.2253,E,0.00,311.19,010307,0,,")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$GPRMC,100936.000,A,0000.0000,S,00000.0000,E,0.00,0.00,101016,0,,8000,0")); } diff --git a/test/org/traccar/protocol/FlextrackProtocolDecoderTest.java b/test/org/traccar/protocol/FlextrackProtocolDecoderTest.java index 0f93e9508..ed6aaf02d 100644 --- a/test/org/traccar/protocol/FlextrackProtocolDecoderTest.java +++ b/test/org/traccar/protocol/FlextrackProtocolDecoderTest.java @@ -11,10 +11,10 @@ public class FlextrackProtocolDecoderTest extends ProtocolTest { FlextrackProtocolDecoder decoder = new FlextrackProtocolDecoder(new FlextrackProtocol()); - verifyNothing(decoder, text( + verifyNull(decoder, text( "-1,LOGON,7000000123,8945000000")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "-1,LOGON,1080424008,8945020110126633198")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/GalileoProtocolDecoderTest.java b/test/org/traccar/protocol/GalileoProtocolDecoderTest.java index 28d40829a..2ad6cc582 100644 --- a/test/org/traccar/protocol/GalileoProtocolDecoderTest.java +++ b/test/org/traccar/protocol/GalileoProtocolDecoderTest.java @@ -15,7 +15,7 @@ public class GalileoProtocolDecoderTest extends ProtocolTest { verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN, "0144030338363832303430303132363939333404320010ee0f20f5a86c57300570172f03bc7dfd023363002604343e00351c40092a414a6842af0e432445000046030050246b51666a524c055300000338363832303430303132363939333404320010ed0f20f4a86c57300570172f03b47dfd023363000d05343e00351140090a41c56742a60e432445000046030050b56a514f6a521b045300000338363832303430303132363939333404320010ec0f20e6a86c57300b34172f03287efd023300000000344900350d40290a41562742030b43234500004603205023455190445295005300000338363832303430303132363939333404320010eb0f20e4a86c57300b34172f03287efd023300000000344900350d40290b41000042bd0b432345000046032050dc31518c315200005300000338363832303430303132363939333404320010ea0f20c7a86c57300b34172f03287efd023300000000344900350d40a90b41000042050d43234500004600205000005100005200005300000338363832303430303132363939333404320010e90f204fa86c57300b34172f03287efd023300000000344900350d40a90b41000042ff0c43244500004600205000005100005200005300000338363832303430303132363939333404320010e80f20d7a76c57300b34172f03287efd023300000000344900350d40a90b41000042fd0c43244500004600205000005100005200005300000338363832303430303132363939333404320010e70f205fa76c57300b34172f03287efd023300000000344900350d40a90b41000042fd0c43254500004600205000005100005200005300000338363832303430303132363939333404320010e60f20e7a66c57300b34172f03287efd023300000000344900350d40a90b41000042fd0c43264500004600205000005100005200005300000338363832303430303132363939333404320010e50f206fa66c57300468172f03907cfd023300007a0a343600352b40a90b41000042030d43274500004600205000005100005200005300000338363832303430303132363939333404320010e40f2051a66c5730048c172f03ac7cfd02335300980a341600352b40a12b41000042040d43274500004600e0500000510000520000530000abde")); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "011380033836383230343030313534393038370432008590")); verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN, diff --git a/test/org/traccar/protocol/GatorProtocolDecoderTest.java b/test/org/traccar/protocol/GatorProtocolDecoderTest.java index 8541f14b2..6d4dc06e8 100644 --- a/test/org/traccar/protocol/GatorProtocolDecoderTest.java +++ b/test/org/traccar/protocol/GatorProtocolDecoderTest.java @@ -21,13 +21,13 @@ public class GatorProtocolDecoderTest extends ProtocolTest { verifyAttributes(decoder, binary( "2424800026364101b31608041108380273453415301532000000008000010000122800000124000000c40d")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "242421000658e3d851150d")); verifyAttributes(decoder, binary( "242480002658e3d851a60101c662bc00000000000000000000000000470007a30b0c00b10fc900ff00460d")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "242421000643e30282070d")); verifyPosition(decoder, binary( diff --git a/test/org/traccar/protocol/Gl100ProtocolDecoderTest.java b/test/org/traccar/protocol/Gl100ProtocolDecoderTest.java index 803d076b9..e89b3c190 100644 --- a/test/org/traccar/protocol/Gl100ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Gl100ProtocolDecoderTest.java @@ -23,7 +23,7 @@ public class Gl100ProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "+RESP:GTTRI,135790246811220,2,0,0,1,4.3,92,70.0,1,121.354335,31.222073,20090101000000,0460,0000,18d8,6141,00,1,-3.6,145,30.0,2,121.354442,31.221940,20090101000100,0460,0000,18d8,6141,00,11F0,0102070202")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "AT+GTHBD=HeartBeat,359231030000010,20090101000000,11F0,0102120204")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/Gl200ProtocolDecoderTest.java b/test/org/traccar/protocol/Gl200ProtocolDecoderTest.java index c09b96315..70bcd46b2 100644 --- a/test/org/traccar/protocol/Gl200ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Gl200ProtocolDecoderTest.java @@ -178,7 +178,7 @@ public class Gl200ProtocolDecoderTest extends ProtocolTest { verifyPositions(decoder, text( "+RESP:GTFRI,02010D,867844001675407,,0,0,1,2,0.0,0,28.9,8.591011,56.476397,20140915213209,0238,0001,03CB,2871,,97,20140915213459,009A")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "+RESP:GTINF,359464030073766,8938003990320469804f,18,99,100,1,0,+2.00,0,20131018084015,00EE,0103090402")); verifyPositions(decoder, text( @@ -253,7 +253,7 @@ public class Gl200ProtocolDecoderTest extends ProtocolTest { verifyAttributes(decoder, text( "+RESP:GTVER,1A0800,860599000773978,GL300,GL300,0A03,0103,20161007041531,10F8$")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "+ACK:GTHBD,1A0401,135790246811220,,20100214093254,11F0")); verifyAttributes(decoder, text( diff --git a/test/org/traccar/protocol/GlobalSatProtocolDecoderTest.java b/test/org/traccar/protocol/GlobalSatProtocolDecoderTest.java index 9f66fee1f..fb9928d75 100644 --- a/test/org/traccar/protocol/GlobalSatProtocolDecoderTest.java +++ b/test/org/traccar/protocol/GlobalSatProtocolDecoderTest.java @@ -10,7 +10,7 @@ public class GlobalSatProtocolDecoderTest extends ProtocolTest { GlobalSatProtocolDecoder decoder = new GlobalSatProtocolDecoder(new GlobalSatProtocol()); - verifyNothing(decoder, text( + verifyNull(decoder, text( "GSh,131826789036289,3,M,ea04*3d")); decoder.setFormat0("SORPZAB27GHKLMN*U!"); diff --git a/test/org/traccar/protocol/GnxProtocolDecoderTest.java b/test/org/traccar/protocol/GnxProtocolDecoderTest.java index d89c96ac3..a701d6bfd 100644 --- a/test/org/traccar/protocol/GnxProtocolDecoderTest.java +++ b/test/org/traccar/protocol/GnxProtocolDecoderTest.java @@ -16,13 +16,13 @@ public class GnxProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "$GNX_LOC,865733022352132,095,0,102134,280914,102134,280914,1,18.765432,N,073.752811,W,032,165.32,12,25,0,A,E,2,000099.9,000099.5,GNX01001,12*")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$GNX_LOC,865733022354161,139,0,142838,160316,142825,160316,0,000000000,N,0000000000,E,000,0.00,00,48,0,e,C,2,000000.0,000000.0,GNX04008,BB*")); verifyPosition(decoder, text( "$GNX_DIO,863071015071563,110,1,155627,121214,151244,121214,1,08.878321,N,076.643154,E,0,0,0,0,0,0,GNX01001,B1*")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$GNX_DIO,865733022354161,112,1,142849,160316,142714,160316,0,000000000,N,0000000000,E,0,0,0,0,0,0,0,GNX04008,1A*")); } diff --git a/test/org/traccar/protocol/GoSafeProtocolDecoderTest.java b/test/org/traccar/protocol/GoSafeProtocolDecoderTest.java index 08bfa3f80..42293f7ec 100644 --- a/test/org/traccar/protocol/GoSafeProtocolDecoderTest.java +++ b/test/org/traccar/protocol/GoSafeProtocolDecoderTest.java @@ -37,7 +37,7 @@ public class GoSafeProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "*GS02,358696043774648,GPS:230040;A;S1.166829;E36.934287;0;0;170116,STT:20;0,MGR:32755204,ADC:0;11.2;1;28.3;2;4.1,GFS:0;0")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "*GS02,358696043774648")); verifyPositions(decoder, text( @@ -49,7 +49,7 @@ public class GoSafeProtocolDecoderTest extends ProtocolTest { verifyPositions(decoder, text( "*GS16,351535059439208,083515281015,,GPS:A;9;N31.959502;E35.908316;;108;890;1.05;1.79,GSM:1;4;416;3;AF0;A3A6;-59;416;3;AF0;A3A3;-50;416;3;AF0;A3A4;-56;416;3;AF0;A3A5;-62;416;3;AF0;B195;-76,OBD:04410C194603410D2303411C0103410583037F011203411115")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "*GS16,351535058709775")); verifyPositions(decoder, text( diff --git a/test/org/traccar/protocol/GotopProtocolDecoderTest.java b/test/org/traccar/protocol/GotopProtocolDecoderTest.java index ad894f4d1..f38cf98ef 100644 --- a/test/org/traccar/protocol/GotopProtocolDecoderTest.java +++ b/test/org/traccar/protocol/GotopProtocolDecoderTest.java @@ -10,10 +10,10 @@ public class GotopProtocolDecoderTest extends ProtocolTest { GotopProtocolDecoder decoder = new GotopProtocolDecoder(new GotopProtocol()); - verifyNothing(decoder, text( + verifyNull(decoder, text( "")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "353327020412763,CMD-X")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java b/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java index a2f69a8fa..c1f29add6 100644 --- a/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java @@ -52,7 +52,7 @@ public class Gps103ProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "359769031878322imei:359769031878322,tracker,1602160718,2,F,221811.000,A,1655.2193,S,14546.6722,E,0.00,,")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "imei:865328021049167,OBD,141118115036,,,0.0,,000,0.0%,+,0.0%,00000,,,,,")); verifyAttributes(decoder, text( @@ -86,15 +86,15 @@ public class Gps103ProtocolDecoderTest extends ProtocolTest { position("2015-10-27 01:15:31.000", true, 60.33830, 25.10323)); // Log on request - verifyNothing(decoder, text( + verifyNull(decoder, text( "##,imei:359586015829802,A")); // Heartbeat package - verifyNothing(decoder, text( + verifyNull(decoder, text( "359586015829802")); // No GPS signal - verifyNothing(decoder, text( + verifyNull(decoder, text( "imei:359586015829802,tracker,000000000,13554900601,L,;")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/GpsGateProtocolDecoderTest.java b/test/org/traccar/protocol/GpsGateProtocolDecoderTest.java index 67c5ccf51..bcccf874b 100644 --- a/test/org/traccar/protocol/GpsGateProtocolDecoderTest.java +++ b/test/org/traccar/protocol/GpsGateProtocolDecoderTest.java @@ -19,22 +19,22 @@ public class GpsGateProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "$FRCMD,353067011068246,_SendMessage,,1918.1942,N,09906.3696,W,2246.5,000.0,295.9,150416,213147.00,1,Odometer=*70")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$FRCMD,862950025974620,_Ping,voltage=4*4F")); verifyPosition(decoder, text( "$FRCMD,862950025974620,_SendMessage, ,2721.5781,S,15259.145,E,61,0.00,61,080316,092612,1,SosButton=0,voltage=4*60")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$FRLIN,,user1,8IVHF*7A")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$FRLIN,,354503026292842,VGZTHKT*0C")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$FRLIN,IMEI,1234123412341234,*7B")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$FRLIN,,saab93_device,KLRFBGIVDJ*28")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/GpsMarkerProtocolDecoderTest.java b/test/org/traccar/protocol/GpsMarkerProtocolDecoderTest.java index 8e25598fc..64016b404 100644 --- a/test/org/traccar/protocol/GpsMarkerProtocolDecoderTest.java +++ b/test/org/traccar/protocol/GpsMarkerProtocolDecoderTest.java @@ -14,7 +14,7 @@ public class GpsMarkerProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "$GM23D863071014445404T260816142611N55441051E037325071033063C0530304#")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$GM300350123456789012T100511123300G25000001772F185200000000000000005230298#")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java index 3bb180206..7893b459a 100644 --- a/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java @@ -10,16 +10,16 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest { Gt06ProtocolDecoder decoder = new Gt06ProtocolDecoder(new Gt06Protocol()); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "787805120099abec0d0a")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "78780D01086471700328358100093F040D0A")); verifyAttributes(decoder, binary( "7979003F940D110315102A202141494F494C2C30322C3030382E3239302C3032392E3630302C3531394A2C303430302C3030382E3433302C302C30302C4142001678EA0D0A")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "79790005840016BB1A0D0A")); verifyAttributes(decoder, binary( @@ -43,10 +43,10 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest { verifyAttributes(decoder, binary( "787829152100000000526573746f7265206675656c20737570706c793a2053756363657373210002014077ce0d0a")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "78780D01012345678901234500018CDD0D0A")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "78780d0103534190360660610003c3df0d0a")); verifyAttributes(decoder, binary( @@ -80,19 +80,19 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, binary( "7878471e0e03110b0511c501c664fd074db73f0218a602e003433a002fed40433a0056e14e433a0056104e433a0056fd53433a002eed55433a007e4b57433a002ee25aff00020120f6720d0a")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "7979005bfd0358899050927725004c0020bf984358df603b2ea3a339e54335013a5b56455253494f4e5d47543036445f32305f3630444d325f423235455f5631355f574d5b4255494c445d323031332f31322f32382031353a3234002a3b240d0a7979005bfd0358899050927725004c0020bf984358df603b2ea3a339e54335013a5b56455253494f4e5d47543036445f32305f3630444d325f423235455f5631355f574d5b4255494c445d323031332f31322f32382031353a3234002d4f9b0d0a7979005bfd0358899050927725004c0020bf984358df603b2ea3a339e54335013a5b56455253494f4e5d47543036445f32305f3630444d325f423235455f5631355f574d5b4255494c445d323031332f31322f32382031353a3234003084ff0d0a")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "78788b818300000000534545464e2626004f04220045042626262b37393035343031353534362626262626260410041b0415041a04210415041926262b373930363433333031313526260410043d044f26262b373936303437383430363426260412043e0432043026262b373932383834373738383126262626262626262626262626262626232300020022155d0d0a")); verifyPosition(decoder, binary( "787822220e0914160f07c9021a362805090a7800d8b802d402c30e00a98a0105010213f4bb0d0a")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "787811010864717003664467100f190a0002c6d20d0a")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "787811010123456789012345100B3201000171930D0A")); } diff --git a/test/org/traccar/protocol/H02ProtocolDecoderTest.java b/test/org/traccar/protocol/H02ProtocolDecoderTest.java index f39c3a689..6e6b37b83 100644 --- a/test/org/traccar/protocol/H02ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/H02ProtocolDecoderTest.java @@ -35,7 +35,7 @@ public class H02ProtocolDecoderTest extends ProtocolTest { verifyAttributes(decoder, buffer( "*HQ,4109179024,NBR,103732,722,310,0,6,8106,32010,23,8101,22007,25,8106,12010,23,8106,22105,22,8101,22012,16,8106,42010,5,100217,FFFFFBFF,5#")); - verifyNothing(decoder, buffer( + verifyNull(decoder, buffer( "*HQ,355488020930796,V3,002339,62160,06,024852,035421,148,0,024852,035425,143,,022251,036482,137,,024852,000335,133,,024852,031751,133,,024852,035423,133,,02A1,0,X,010104,EFE7FBFF#")); verifyPosition(decoder, buffer( @@ -50,7 +50,7 @@ public class H02ProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, buffer( "*HQ,353588020068342,V1,084436,A,3257.01525,N,00655.03865,W,57.78,40,011216,FFFBFFFF,25c,a, 154,b04c#")); - verifyNothing(decoder, buffer( + verifyNull(decoder, buffer( "*HQ,356803210091319,BS,,2d4,a,1b63,1969,26,1b63,10b2,31,0,0,25,,ffffffff,60#")); verifyAttributes(decoder, buffer( @@ -62,10 +62,10 @@ public class H02ProtocolDecoderTest extends ProtocolTest { verifyAttributes(decoder, buffer( "*HQ,1600068860,NBR,110326,262,03,255,6,802,23152,23,812,49449,14,802,35382,13,802,35402,11,812,56622,09,802,23132,04,081116,FFFFFBFF#")); - verifyNothing(decoder, buffer( + verifyNull(decoder, buffer( "*HQ,1600068860,LINK,112137,20,8,67,0,0,081116,FFFFFBFF#")); - verifyNothing(decoder, buffer( + verifyNull(decoder, buffer( "*HQ,355488020533263,V3,121536,65501,04,000152,014001,156,-64,000161,010642,138,,000152,014003,129,,000152,013973,126,,02E4,0,X,071116,FFFFFBFF#")); verifyPosition(decoder, buffer( @@ -95,7 +95,7 @@ public class H02ProtocolDecoderTest extends ProtocolTest { "*HQ,1451316409,V1,030149,A,-23-29.0095,S,-46-51.5852,W,2.4,065,070315,FFFFFFFF#"), position("2015-03-07 03:01:49.000", true, -23.48349, -46.85975)); - verifyNothing(decoder, buffer( + verifyNull(decoder, buffer( "*HQ,353588020068342,V1,000000,V,0.0000,0,0.0000,0,0.00,0.00,000000,ffffffff,000106,000002,000203,004c87,16#")); verifyPosition(decoder, buffer( @@ -155,7 +155,7 @@ public class H02ProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, buffer( "*HQ,356823035368767,V1,083618,A,0955.6392,N,07809.0796,E,0.00,0,070414,FFFBFFFF,194,3b5, 71,c9a9#")); - verifyNothing(decoder, buffer( + verifyNull(decoder, buffer( "*HQ,8401016597,BASE,152609,0,0,0,0,211014,FFFFFFFF#")); verifyPosition(decoder, binary( diff --git a/test/org/traccar/protocol/HomtecsProtocolDecoderTest.java b/test/org/traccar/protocol/HomtecsProtocolDecoderTest.java index 7852fb0e3..b75f1b5dd 100644 --- a/test/org/traccar/protocol/HomtecsProtocolDecoderTest.java +++ b/test/org/traccar/protocol/HomtecsProtocolDecoderTest.java @@ -10,7 +10,7 @@ public class HomtecsProtocolDecoderTest extends ProtocolTest { HomtecsProtocolDecoder decoder = new HomtecsProtocolDecoder(new HomtecsProtocol()); - verifyNothing(decoder, text( + verifyNull(decoder, text( "MDS0001_R6d1821f7,170323,143601.00,04,,,,,,,,,")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/HuaShengProtocolDecoderTest.java b/test/org/traccar/protocol/HuaShengProtocolDecoderTest.java index e6c918ff3..424d7959b 100644 --- a/test/org/traccar/protocol/HuaShengProtocolDecoderTest.java +++ b/test/org/traccar/protocol/HuaShengProtocolDecoderTest.java @@ -10,7 +10,7 @@ public class HuaShengProtocolDecoderTest extends ProtocolTest { HuaShengProtocolDecoder decoder = new HuaShengProtocolDecoder(new HuaShengProtocol()); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "c000000077aa0200000000000e000100143347315f48312e315f56312e30372e54000300133335353835353035303434303635380004000b3531323030303000050005010006000400070004000800050000090018383936313032353431343533333239313833360d000a000f796573696e7465726e6574c0")); verifyPosition(decoder, binary( @@ -28,13 +28,13 @@ public class HuaShengProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, binary( "c00000004baa00000000000005c400000131363037303630323537303800e6c82effcc7cb0003900a30089000000010015000000000000000000f20559ff577ce3980005000a060500000087c0")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "c0010c003e0002000000000010020012a0014f42445f3347315f56312e302e330013a0043335353835353035303434303635380006a08701000006a0a1035fc0")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "c0010c00120060000000000004000600010100c0")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "C00000007EAA020000000000010001001047315F48312E305F56312E3000030013383632393530303238353334333036000400144C342D56374C673979497A7A2D724A6D0005000501000600084341524400070008434152440008000500000900183839383630303530313931343436313130393134000A0009434D4E4554C0")); verifyPosition(decoder, binary( diff --git a/test/org/traccar/protocol/HuabaoProtocolDecoderTest.java b/test/org/traccar/protocol/HuabaoProtocolDecoderTest.java index 996fa874d..ba4c726ec 100644 --- a/test/org/traccar/protocol/HuabaoProtocolDecoderTest.java +++ b/test/org/traccar/protocol/HuabaoProtocolDecoderTest.java @@ -16,25 +16,25 @@ public class HuabaoProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, binary( "7e0200002c00160128561400030000000000040007005de13c065c6cdb00160000000017011710054201040000a9002a02000030011b310104e47e")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "7e0100002d0141305678720024002c012f373031313142534a2d41362d424400000000000000000000003035363738373201d4c14238383838386d7e")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "7E0100002D013511221122000500000000373031303748422D52303347424400000000000000000000003233363631303402CBD5424136383630387E")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "7e0100002d007089994489002800000000000000000048422d523033474244000000000000000000000031393036373531024142433030303030d17e")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "7E0102000E013511221122000661757468656E7469636174696F6E3F7E")); verifyPosition(decoder, binary( "7E02000032013511221122000700000000000C000301578CC006CA3A5C00470000000014072317201501040000000030011631010BD07E")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "7E010200100940278494700084323031313131303831313333323139369F7E")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "7e010000190940278494700012000000000000000000000000000000000000094027849470000a7e")); verifyPosition(decoder, binary( diff --git a/test/org/traccar/protocol/IntellitracProtocolDecoderTest.java b/test/org/traccar/protocol/IntellitracProtocolDecoderTest.java index 2540fd986..390017f17 100644 --- a/test/org/traccar/protocol/IntellitracProtocolDecoderTest.java +++ b/test/org/traccar/protocol/IntellitracProtocolDecoderTest.java @@ -10,7 +10,7 @@ public class IntellitracProtocolDecoderTest extends ProtocolTest { IntellitracProtocolDecoder decoder = new IntellitracProtocolDecoder(new IntellitracProtocol()); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$OK:TRACKING")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/Jt600ProtocolDecoderTest.java b/test/org/traccar/protocol/Jt600ProtocolDecoderTest.java index 59dc311aa..3b040297d 100644 --- a/test/org/traccar/protocol/Jt600ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Jt600ProtocolDecoderTest.java @@ -29,7 +29,7 @@ public class Jt600ProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, buffer( "(3301210003,U03,040812,185302,T,22.564025,N,113.242329,E,5,152,9,32%,00000000000011,10133,5173,22,100,1)")); - verifyNothing(decoder, buffer( + verifyNull(decoder, buffer( "(3301210003,U04)")); verifyPosition(decoder, buffer( @@ -41,7 +41,7 @@ public class Jt600ProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, buffer( "(3460311327,U01,010100,000024,F,0.000000,N,0.000000,E,0.00,0,0,100%,00000001000000,263,1,18,0,0,33)")); - verifyNothing(decoder, buffer( + verifyNull(decoder, buffer( "(3460311327,@JT)")); verifyPosition(decoder, buffer( @@ -73,7 +73,7 @@ public class Jt600ProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, buffer( "(3330104377,U01,010100,010228,F,00.000000,N,000.000000,E,0,0,0,0%,00001000000000,741,14,22,0,206)")); - verifyNothing(decoder, buffer( + verifyNull(decoder, buffer( "(6221107674,2,U09,129,2,A,280513113036,E,02711.0500,S,1721.0876,A,030613171243,E,02756.7618,S,2300.0325,3491,538200,14400,1)")); verifyPosition(decoder, buffer( diff --git a/test/org/traccar/protocol/KhdProtocolDecoderTest.java b/test/org/traccar/protocol/KhdProtocolDecoderTest.java index e85695be8..51f6f3700 100644 --- a/test/org/traccar/protocol/KhdProtocolDecoderTest.java +++ b/test/org/traccar/protocol/KhdProtocolDecoderTest.java @@ -10,7 +10,7 @@ public class KhdProtocolDecoderTest extends ProtocolTest { KhdProtocolDecoder decoder = new KhdProtocolDecoder(new KhdProtocol()); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "2929b1000605162935b80d")); verifyPosition(decoder, binary( diff --git a/test/org/traccar/protocol/LaipacProtocolDecoderTest.java b/test/org/traccar/protocol/LaipacProtocolDecoderTest.java index b1bb954db..787f33e65 100644 --- a/test/org/traccar/protocol/LaipacProtocolDecoderTest.java +++ b/test/org/traccar/protocol/LaipacProtocolDecoderTest.java @@ -13,19 +13,19 @@ public class LaipacProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "$AVRMC,80006405,212645,r,3013.9938,N,08133.3998,W,0.00,0.00,010317,a,4076,0,1,0,0,53170583,310260*78")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$AVSYS,99999999,V1.50,SN0000103,32768*15")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$ECHK,99999999,0*35")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$AVSYS,MSG00002,14406,7046811160,64*1A")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$EAVSYS,MSG00002,8931086013104404999,,Owner,0x52014406*76")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$ECHK,MSG00002,0*5E")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/M2mProtocolDecoderTest.java b/test/org/traccar/protocol/M2mProtocolDecoderTest.java index b2c6d91d8..114dfaf96 100644 --- a/test/org/traccar/protocol/M2mProtocolDecoderTest.java +++ b/test/org/traccar/protocol/M2mProtocolDecoderTest.java @@ -10,7 +10,7 @@ public class M2mProtocolDecoderTest extends ProtocolTest { M2mProtocolDecoder decoder = new M2mProtocolDecoder(new M2mProtocol()); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "235A3C2A2624215C287D70212A21254C7C6421220B0B0B")); verifyPosition(decoder, binary( diff --git a/test/org/traccar/protocol/MegastekProtocolDecoderTest.java b/test/org/traccar/protocol/MegastekProtocolDecoderTest.java index fae0ef93d..a20a0b69b 100644 --- a/test/org/traccar/protocol/MegastekProtocolDecoderTest.java +++ b/test/org/traccar/protocol/MegastekProtocolDecoderTest.java @@ -22,10 +22,10 @@ public class MegastekProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "STX,865067021328417,$GPRMC,064721.000,A,4241.2793,N,02321.9762,E,6.74,346.90,300316,,,1*CA,F,Nil-Alarms,imei:865067021328417,9,559.8,Battery=82%,0,284,03,047E,2B5F;99")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "0147$MGV002,354550050292669,GVT900,S,141215,031804,A,,S,,E,00,04,00,5.17,0.000,193.05,117.1,0.0,510,10,041B,0A5E,,0000,0000,22,12,0, , ,,1-1,98,Timer;!")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "0137$MGV002,354550050292669,GVT900,R,141215,031804,A,,S,,E,00,03,00,3.67,0.000,0.00,117.1,0.0,510,10,,,,0000,0000,22,12,0, , ,,1-1,98,PW ON;!")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/MeiligaoProtocolDecoderTest.java b/test/org/traccar/protocol/MeiligaoProtocolDecoderTest.java index 0633a6291..124dcd852 100644 --- a/test/org/traccar/protocol/MeiligaoProtocolDecoderTest.java +++ b/test/org/traccar/protocol/MeiligaoProtocolDecoderTest.java @@ -31,7 +31,7 @@ public class MeiligaoProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, binary( "242400680790209818ffff99553038333235382e3030302c412c303131352e393338302c532c30333634382e313430392c452c302e30302c3331352e35352c3132303131367c302e37347c313930322e337c303430307c303030302c303030307c302e30f41b0d0a")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "24240011671440258855405000b24d0d0a")); verifyPosition(decoder, binary( @@ -45,10 +45,10 @@ public class MeiligaoProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, binary( "24240076220720151fffff99660012b3ab00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007c3135303634382c3233303731352c313931352e37323835362c4e2c30373235322e35333034342c456dd00d0a")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "24240000123456FFFFFFFF50008B9B0D0A")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "24240011300600000046090002849a0d0a")); verifyPosition(decoder, binary( @@ -87,7 +87,7 @@ public class MeiligaoProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, binary( "2424000026016100901fff99553136353835332c412c343130392e36303231322c4e2c3833382e35393131392c572c332e3838332c31322e30302c3034303731332c2c2a34467c322e357c3131307c000600007c0000010f7c303242302c3042333697740d0a")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "2424000067622010053562aa0000010001ae4f00000007800000003039353135362e3030302c412c323632332e383936362c4e2c30353030352e303638302c452c32342e352c3234312e302c323231303133599c0d0a")); verifyPosition(decoder, binary( diff --git a/test/org/traccar/protocol/MeitrackProtocolDecoderTest.java b/test/org/traccar/protocol/MeitrackProtocolDecoderTest.java index d387332d6..6b711d44a 100644 --- a/test/org/traccar/protocol/MeitrackProtocolDecoderTest.java +++ b/test/org/traccar/protocol/MeitrackProtocolDecoderTest.java @@ -17,7 +17,7 @@ public class MeitrackProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, buffer( "$$K157,866771027160687,AAA,3,37.040231,10.042391,160412151656,A,10,11,0,48,0.8,21,1035518,774980,605|2|0010|307B,0400,0000|0000|0000|0A47|03E3,,,1,0000,001206*2C")); - verifyNothing(decoder, buffer( + verifyNull(decoder, buffer( "$$D28,353358017784062,D03,OK*F3")); verifyPosition(decoder, buffer( diff --git a/test/org/traccar/protocol/MiniFinderProtocolDecoderTest.java b/test/org/traccar/protocol/MiniFinderProtocolDecoderTest.java index 4667ab871..f2d3f2ade 100644 --- a/test/org/traccar/protocol/MiniFinderProtocolDecoderTest.java +++ b/test/org/traccar/protocol/MiniFinderProtocolDecoderTest.java @@ -10,13 +10,13 @@ public class MiniFinderProtocolDecoderTest extends ProtocolTest { MiniFinderProtocolDecoder decoder = new MiniFinderProtocolDecoder(new MiniFinderProtocol()); - verifyNothing(decoder, text( + verifyNull(decoder, text( "!1,123456789012345")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "!5,17,V")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "!1,860719027585011")); verifyPosition(decoder, text( @@ -43,7 +43,7 @@ public class MiniFinderProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "!D,08/07/15,02:01:32,40.428230,-3.704950,4,170,170001,682.7,43,6,13,0")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "!1,860719020212696")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/NavigilProtocolDecoderTest.java b/test/org/traccar/protocol/NavigilProtocolDecoderTest.java index eaddadf75..6c7612f61 100644 --- a/test/org/traccar/protocol/NavigilProtocolDecoderTest.java +++ b/test/org/traccar/protocol/NavigilProtocolDecoderTest.java @@ -12,7 +12,7 @@ public class NavigilProtocolDecoderTest extends ProtocolTest { NavigilProtocolDecoder decoder = new NavigilProtocolDecoder(new NavigilProtocol()); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "01004300040020000000f60203080200e7cd0f510c0000003b00000000000000")); verifyPosition(decoder, binary(ByteOrder.LITTLE_ENDIAN, diff --git a/test/org/traccar/protocol/NavisProtocolDecoderTest.java b/test/org/traccar/protocol/NavisProtocolDecoderTest.java index 432d0eaca..32dd4739f 100644 --- a/test/org/traccar/protocol/NavisProtocolDecoderTest.java +++ b/test/org/traccar/protocol/NavisProtocolDecoderTest.java @@ -13,7 +13,7 @@ public class NavisProtocolDecoderTest extends ProtocolTest { NavisProtocolDecoder decoder = new NavisProtocolDecoder(new NavisProtocol()); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "404E5443010000007B000000130044342A3E533A383631373835303035323035303739")); verifyPosition(decoder, binary(ByteOrder.LITTLE_ENDIAN, @@ -29,7 +29,7 @@ public class NavisProtocolDecoderTest extends ProtocolTest { verifyPositions(decoder, binary(ByteOrder.LITTLE_ENDIAN, "404E5443010000007B0000005A0050692A3E410125DB0E00000015110707110A0C0880630000AA39A2381600020000000000000000000C110708110A0CB389793F1AEF263F00000000120034F516440000000000000000000000FAFF000000FAFF000000FAFF80808080")); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "404E5443010000007B000000130047372A3E533A383631373835303035313236303639")); } diff --git a/test/org/traccar/protocol/NoranProtocolDecoderTest.java b/test/org/traccar/protocol/NoranProtocolDecoderTest.java index 1b7287e7b..1132ec805 100644 --- a/test/org/traccar/protocol/NoranProtocolDecoderTest.java +++ b/test/org/traccar/protocol/NoranProtocolDecoderTest.java @@ -12,7 +12,7 @@ public class NoranProtocolDecoderTest extends ProtocolTest { NoranProtocolDecoder decoder = new NoranProtocolDecoder(new NoranProtocol()); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "0d0a2a4b57000d000080010d0a")); verifyPosition(decoder, binary(ByteOrder.LITTLE_ENDIAN, @@ -30,7 +30,7 @@ public class NoranProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, binary(ByteOrder.LITTLE_ENDIAN, "34000800010c000000000080a3438e20944149bd07c24e523039423139323832000031352d30342d32362030383a34333a353300")); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "0f0000004e52303946303431353500")); verifyPosition(decoder, binary(ByteOrder.LITTLE_ENDIAN, diff --git a/test/org/traccar/protocol/NvsProtocolDecoderTest.java b/test/org/traccar/protocol/NvsProtocolDecoderTest.java index fef610fff..70d3696eb 100644 --- a/test/org/traccar/protocol/NvsProtocolDecoderTest.java +++ b/test/org/traccar/protocol/NvsProtocolDecoderTest.java @@ -10,10 +10,10 @@ public class NvsProtocolDecoderTest extends ProtocolTest { NvsProtocolDecoder decoder = new NvsProtocolDecoder(new NvsProtocol()); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "0012333537303430303630303137383234312e38")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "0012313233343536373839303132333435312E31")); verifyPositions(decoder, binary( diff --git a/test/org/traccar/protocol/ObdDongleProtocolDecoderTest.java b/test/org/traccar/protocol/ObdDongleProtocolDecoderTest.java index 19e3a4ff2..6b7662e49 100644 --- a/test/org/traccar/protocol/ObdDongleProtocolDecoderTest.java +++ b/test/org/traccar/protocol/ObdDongleProtocolDecoderTest.java @@ -10,7 +10,7 @@ public class ObdDongleProtocolDecoderTest extends ProtocolTest { ObdDongleProtocolDecoder decoder = new ObdDongleProtocolDecoder(new ObdDongleProtocol()); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "55550003383634383637303232353131303135010009010011023402010201ABAAAA")); verifyPosition(decoder, binary( diff --git a/test/org/traccar/protocol/OsmAndProtocolDecoderTest.java b/test/org/traccar/protocol/OsmAndProtocolDecoderTest.java index 1dc89b251..2d0ef0adf 100644 --- a/test/org/traccar/protocol/OsmAndProtocolDecoderTest.java +++ b/test/org/traccar/protocol/OsmAndProtocolDecoderTest.java @@ -10,7 +10,7 @@ public class OsmAndProtocolDecoderTest extends ProtocolTest { OsmAndProtocolDecoder decoder = new OsmAndProtocolDecoder(new OsmAndProtocol()); - verifyNothing(decoder, request( + verifyNull(decoder, request( "/?timestamp=1377177267&lat=60.0&lon=30.0")); verifyPosition(decoder, request( diff --git a/test/org/traccar/protocol/ProgressProtocolDecoderTest.java b/test/org/traccar/protocol/ProgressProtocolDecoderTest.java index 3a326513b..b080355fb 100644 --- a/test/org/traccar/protocol/ProgressProtocolDecoderTest.java +++ b/test/org/traccar/protocol/ProgressProtocolDecoderTest.java @@ -13,7 +13,7 @@ public class ProgressProtocolDecoderTest extends ProtocolTest { ProgressProtocolDecoder decoder = new ProgressProtocolDecoder(new ProgressProtocol()); - verifyNothing(decoder, binary(ByteOrder.LITTLE_ENDIAN, + verifyNull(decoder, binary(ByteOrder.LITTLE_ENDIAN, "020037000100000003003131310f003335343836383035313339303036320f00323530303136333832383531353535010000000100000000000000e6bb97b6")); /*verifyPosition(decoder, binary(ByteOrder.LITTLE_ENDIAN, diff --git a/test/org/traccar/protocol/RuptelaProtocolDecoderTest.java b/test/org/traccar/protocol/RuptelaProtocolDecoderTest.java index 00f72f5e2..3632ef511 100644 --- a/test/org/traccar/protocol/RuptelaProtocolDecoderTest.java +++ b/test/org/traccar/protocol/RuptelaProtocolDecoderTest.java @@ -10,7 +10,7 @@ public class RuptelaProtocolDecoderTest extends ProtocolTest { RuptelaProtocolDecoder decoder = new RuptelaProtocolDecoder(new RuptelaProtocol()); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "002e000315bc70d3e2ff0f4f42443130302e30312e30382e30300000c2b30ea77e430000601b000001f40000003c00144aa0")); verifyAttributes(decoder, binary( diff --git a/test/org/traccar/protocol/SuntechProtocolDecoderTest.java b/test/org/traccar/protocol/SuntechProtocolDecoderTest.java index 828eaaa21..a9b13b3e6 100644 --- a/test/org/traccar/protocol/SuntechProtocolDecoderTest.java +++ b/test/org/traccar/protocol/SuntechProtocolDecoderTest.java @@ -31,7 +31,7 @@ public class SuntechProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "ST300ALT;205174410;14;712;20110101;00:00:07;00000;+20.593923;-100.336716;000.000;000.00;0;0;0;16.57;000000;81;000000;4.0;0;0.00;0000;0000;0;0")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "SA200ALV;317652")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/T55ProtocolDecoderTest.java b/test/org/traccar/protocol/T55ProtocolDecoderTest.java index 83f60f5b4..7f60a1807 100644 --- a/test/org/traccar/protocol/T55ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/T55ProtocolDecoderTest.java @@ -10,10 +10,10 @@ public class T55ProtocolDecoderTest extends ProtocolTest { T55ProtocolDecoder decoder = new T55ProtocolDecoder(new T55Protocol()); - verifyNothing(decoder, text( + verifyNull(decoder, text( "086415031C20")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "358244017671308")); verifyPosition(decoder, text( @@ -28,16 +28,16 @@ public class T55ProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "$GPRMC,073446.000,A,1255.5125,N,07738.2948,E,0.00,0.53,080316,D*71,11,865733027593268,1,090,086")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$GPFID,ID123456ABC")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$PGID,359853000144328*0F")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$PCPTI,CradlePoint Test,184453,184453.0,6F*57")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "IMEI 351467108700000")); verifyPosition(decoder, text( @@ -97,7 +97,7 @@ public class T55ProtocolDecoderTest extends ProtocolTest { T55ProtocolDecoder decoder = new T55ProtocolDecoder(new T55Protocol()); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$GPRMC,012006,A,4828.10,N,1353.52,E,0.00,0.00,180915,020.3,E*42")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/T800xProtocolDecoderTest.java b/test/org/traccar/protocol/T800xProtocolDecoderTest.java index f176234f2..0f311478f 100644 --- a/test/org/traccar/protocol/T800xProtocolDecoderTest.java +++ b/test/org/traccar/protocol/T800xProtocolDecoderTest.java @@ -10,19 +10,19 @@ public class T800xProtocolDecoderTest extends ProtocolTest { T800xProtocolDecoder decoder = new T800xProtocolDecoder(new T800xProtocol()); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "232301001500000880316890202968140197625020")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "232303000f00000880316890202968")); verifyAttributes(decoder, binary( "232302004200000880316890202968001e02582d00000000000000050000320000018901920000001dc1e2001601081154255d0202005a0053875a00a57e5a00af80")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "232301001500020357367031063979150208625010")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "232303000f00000357367031063979")); verifyPosition(decoder, binary( diff --git a/test/org/traccar/protocol/TelicProtocolDecoderTest.java b/test/org/traccar/protocol/TelicProtocolDecoderTest.java index 74257ee6b..85d6f70ac 100644 --- a/test/org/traccar/protocol/TelicProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TelicProtocolDecoderTest.java @@ -28,22 +28,22 @@ public class TelicProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "072027997498,230317082635,0,230317082635,260332,444265,3,28,165,,,,124,61107582,226,01,00,255,219,00000000000000")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "0026203393|226|10|002004010")); verifyPosition(decoder, text( "003020339325,190317083052,0,180317103127,259924,445133,3,0,0,9,,,93,12210141,,0010,00,40,240,0,0406")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "0026296218SCCE01_SCCE|226|10|0267")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "1242022592TTUV0100,0201,351266000022592,170403114305,0115859,480323,3,30,5,9,3,4,650,250000000,26202,1001,0001,211,233,111,0")); verifyPosition(decoder, text( "123002259213,170403114305,1234,170403114305,0115859,480323,3,30,5,9,3,4,650,250000000,26202,1001,0001,211,233,111,0,600")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "0044296218TLOC0267,00,011009000296218,190317083036,255178,445072,3,0,82,,,,168,14741296,,00,00,0,217")); verifyPosition(decoder, text( @@ -61,7 +61,7 @@ public class TelicProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "003097061325,210216112630,0,210216001405,246985,594078,3,0,283,12,,,23,4418669,,0010,00,117,0,0,0108")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "0026970613|248|01|004006011")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/TeltonikaProtocolDecoderTest.java b/test/org/traccar/protocol/TeltonikaProtocolDecoderTest.java index d1c669328..cadb254a2 100644 --- a/test/org/traccar/protocol/TeltonikaProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TeltonikaProtocolDecoderTest.java @@ -10,7 +10,7 @@ public class TeltonikaProtocolDecoderTest extends ProtocolTest { TeltonikaProtocolDecoder decoder = new TeltonikaProtocolDecoder(new TeltonikaProtocol()); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "000F313233343536373839303132333435")); verifyPositions(decoder, false, binary( diff --git a/test/org/traccar/protocol/ThinkRaceProtocolDecoderTest.java b/test/org/traccar/protocol/ThinkRaceProtocolDecoderTest.java index 2a2d140d3..cf8eb12aa 100644 --- a/test/org/traccar/protocol/ThinkRaceProtocolDecoderTest.java +++ b/test/org/traccar/protocol/ThinkRaceProtocolDecoderTest.java @@ -10,7 +10,7 @@ public class ThinkRaceProtocolDecoderTest extends ProtocolTest { ThinkRaceProtocolDecoder decoder = new ThinkRaceProtocolDecoder(new ThinkRaceProtocol()); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "48415349483031343730303134382C8000100134363030303134363139363239343806FF")); verifyPosition(decoder, binary( diff --git a/test/org/traccar/protocol/Tk102ProtocolDecoderTest.java b/test/org/traccar/protocol/Tk102ProtocolDecoderTest.java index 34ae1ab90..66946007a 100644 --- a/test/org/traccar/protocol/Tk102ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Tk102ProtocolDecoderTest.java @@ -10,10 +10,10 @@ public class Tk102ProtocolDecoderTest extends ProtocolTest { Tk102ProtocolDecoder decoder = new Tk102ProtocolDecoder(new Tk102Protocol()); - verifyNothing(decoder, buffer( + verifyNull(decoder, buffer( "[\u00800000000000\u000821315452]")); - verifyNothing(decoder, buffer( + verifyNull(decoder, buffer( "[\u00f00000000000\u000821315452]")); verifyPosition(decoder, buffer( @@ -22,16 +22,16 @@ public class Tk102ProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, buffer( "[\u00900100100001\u0036(ITV025857A2232.0729N11356.0030E000.02109110100000000)]")); - verifyNothing(decoder, buffer( + verifyNull(decoder, buffer( "[\u00210000000081\u0072(353327023367238,TK102-W998_01_V1.1.001_130219,255,001,255,001,0,100,100,0,internet,0000,0000,0,0,255,0,4,1,11,00)]")); - verifyNothing(decoder, buffer( + verifyNull(decoder, buffer( "[\u004c0000001323\u004e(GSM,0,0,07410001,20120101162600,404,010,9261,130,0,2353,130,35,9263,130,33,1)]")); - verifyNothing(decoder, buffer( + verifyNull(decoder, buffer( "[\u00250000000082\u001d(100100000000000600-30-65535)]")); - verifyNothing(decoder, buffer( + verifyNull(decoder, buffer( "[\u00230000000004\u0018(062100000000000600-0-0)]")); verifyPosition(decoder, buffer( diff --git a/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java b/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java index da412e9a7..e1b8d969e 100644 --- a/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java @@ -10,7 +10,7 @@ public class Tk103ProtocolDecoderTest extends ProtocolTest { Tk103ProtocolDecoder decoder = new Tk103ProtocolDecoder(new Tk103Protocol()); - verifyNothing(decoder, text( + verifyNull(decoder, text( "(357593060760397BP02,G,2,170304A6015.7466N01101.8460E001.609445591.048,7)")); verifyPosition(decoder, text( @@ -25,13 +25,13 @@ public class Tk103ProtocolDecoderTest extends ProtocolTest { verifyNotNull(decoder, text( "(087073104337BZ00,740,000,3bf7,0425,3bf7,0bf5,3bf7,09e7,3bf7,cbad,3bf7,0dcf,3bf7,c7b2,01000000)")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "(087073005534BP00HSO")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "(027028258309BQ86,0,05550c21b10d1d0f431008bd114c0ea5078400010007a100423932,161117005322,01000001)")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "(027028258309BQ86,0,05470c0eb20d040f4410022911360e92077e00010007a1004237c7,161117005232,01000001)")); verifyPosition(decoder, text( @@ -77,7 +77,7 @@ public class Tk103ProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "(088048003342BR00150807A1352.9871N10030.9084E000.0110718000.0001010000L00000000)")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "(090411121854BP0000001234567890HSO")); verifyPosition(decoder, text( @@ -141,7 +141,7 @@ public class Tk103ProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "(013632651491,ZC17,040613,A,2234.0297N,11405.9101E,000.0,040137,178.48)")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "(013632651491,ZC20,040613,040137,6,42,112,0)")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java b/test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java index 6c3f9df42..9cc59aaa6 100644 --- a/test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java @@ -10,6 +10,11 @@ public class Tlt2hProtocolDecoderTest extends ProtocolTest { Tlt2hProtocolDecoder decoder = new Tlt2hProtocolDecoder(new Tlt2hProtocol()); + verifyNull(decoder, text( + "#861075026000000#\r\n", + "#0000#AUTO#1\r\n", + "#002c4968045$GPRMC,001556.00,A,3542.1569,N,13938.9814,E,7.38,185.71,160417,,,A*55\r\n")); + verifyPositions(decoder, text( "#863835026938048#MT500#0000#AUTO#1\r\n", "#67904917c0e$GPRMC,173926.00,A,4247.8476,N,08342.6996,W,0.03,,160417,,,A*59\r\n")); diff --git a/test/org/traccar/protocol/TotemProtocolDecoderTest.java b/test/org/traccar/protocol/TotemProtocolDecoderTest.java index 404d29796..40d8d9eba 100644 --- a/test/org/traccar/protocol/TotemProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TotemProtocolDecoderTest.java @@ -45,7 +45,7 @@ public class TotemProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "$$AE860990002922822|AA$GPRMC,051002.00,A,0439.26245,N,10108.94448,E,0.023,,140315,,,A*71|02.98|01.95|02.26|000000000000|20150314051003|13841157|105A3B1C|0000|0.0000|0005|5324\r")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$$BB862170017856731|AA$GPRMC,000000.00,V,0000.0000,N,00000.0000,E,000.0,000.0,000000,,,A*73|00.0|00.0|00.0|000000001000|20000000000000|13790000|00000000|00000000|00000000|0.0000|0007|8C23")); verifyPosition(decoder, text( @@ -64,13 +64,13 @@ public class TotemProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "$$B0456123|61$GPRMC,114725.00,A,1258.68276,N,07730.60237,E,0.410,,080113,,,A*79|1.44|0.66|1.27|000000000000|20130108114425|03600000|00000000|053C2BFE|0000|0.3325|0063|2005")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$$AE359772033395899|AA000000000000000000000000000000000000000000000000000000000000|00.0|00.0|00.0|000000000000|20090215000153|13601435|00000000|00000000|0000|0.0000|0007|2DAA")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$$AE359772033395899|AA000000000000000000000000000000000000000000000000000000000000|00.0|00.0|00.0|00000000|20090215001204|14182037|00000000|0012D888|0000|0.0000|0016|5B51")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$$AE359772033395899|AA00000000000000000000000000000000000000000000000000000000000|00.0|00.0|00.0|00000000000|20090215001337|14182013|00000000|0012D888|0000|0.0000|0017|346E")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/Tr20ProtocolDecoderTest.java b/test/org/traccar/protocol/Tr20ProtocolDecoderTest.java index b4c134754..89dd7a6e3 100644 --- a/test/org/traccar/protocol/Tr20ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Tr20ProtocolDecoderTest.java @@ -10,7 +10,7 @@ public class Tr20ProtocolDecoderTest extends ProtocolTest { Tr20ProtocolDecoder decoder = new Tr20ProtocolDecoder(new Tr20Protocol()); - verifyNothing(decoder, text( + verifyNull(decoder, text( "%%TRACKPRO01,1")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/TrackboxProtocolDecoderTest.java b/test/org/traccar/protocol/TrackboxProtocolDecoderTest.java index 33e08b0c1..45feb4bf2 100644 --- a/test/org/traccar/protocol/TrackboxProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TrackboxProtocolDecoderTest.java @@ -10,7 +10,7 @@ public class TrackboxProtocolDecoderTest extends ProtocolTest { TrackboxProtocolDecoder decoder = new TrackboxProtocolDecoder(new TrackboxProtocol()); - verifyNothing(decoder, text( + verifyNull(decoder, text( "a=connect&v=11&i=111111111111111")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/TrvProtocolDecoderTest.java b/test/org/traccar/protocol/TrvProtocolDecoderTest.java index 13ff61792..f7b9ed1ab 100644 --- a/test/org/traccar/protocol/TrvProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TrvProtocolDecoderTest.java @@ -10,7 +10,7 @@ public class TrvProtocolDecoderTest extends ProtocolTest { TrvProtocolDecoder decoder = new TrvProtocolDecoder(new TrvProtocol()); - verifyNothing(decoder, text( + verifyNull(decoder, text( "TRVAP00353456789012345")); verifyAttributes(decoder, text( diff --git a/test/org/traccar/protocol/Tt8850ProtocolDecoderTest.java b/test/org/traccar/protocol/Tt8850ProtocolDecoderTest.java index b2b7c4fe5..6c8302ed1 100644 --- a/test/org/traccar/protocol/Tt8850ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Tt8850ProtocolDecoderTest.java @@ -22,7 +22,7 @@ public class Tt8850ProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "\u0000\u0004,0017,0,GTNMR,,867844000400914,,0,41,1,2,0.0,0,1504.2,-75.569202,6.242850,20150404162835,,,,,97,20150404162836,05EF")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "\u0000\u0004,0017,0,GTPNA,,867844000400914,,0,0,1,0,,,,0,0,,,,,,99,20150404190153,0601")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/TzoneProtocolDecoderTest.java b/test/org/traccar/protocol/TzoneProtocolDecoderTest.java index 08a36ec64..aa8f61772 100644 --- a/test/org/traccar/protocol/TzoneProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TzoneProtocolDecoderTest.java @@ -31,13 +31,13 @@ public class TzoneProtocolDecoderTest extends ProtocolTest { "545A00912424010B021E000008661040203754350F061807083800160400CE5ADC041447620F0618070838000A0000060C7C0004253378370010AAC000000C37018504E500000000800000000000000000390B0A0014061113000000051200140610600014061220001000133800140610070010001473001000151100101500640010000920001000148400000000000000F2EF570D0A"), position("2015-06-24 07:08:56.000", true, 22.53946, 114.06310)); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "545A009E2424010A0205000008637710225481290F010F081E33000000000010A0C000310E35000005840000000000000000000000000066140A00140612200010001511001406101000140612490014061308001015006400051400170014061012000000050200140612470000000504001406100700140612510014061260001015012000000005080014061252001406130900101501410000000506000853A40D0A")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "545A00992424010A0205000008637710225481290F010F082634000000000010A0C000311035000005870000000000000000000000000061130A000000050800101500640014061251001406130800051400170010150141001406101000140612200014061309000000050200140610070014061260001406124900140612470014061012001406125200100015110010150120000000050400183E8A0D0A")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "545A00942424010A0205000008637710225481290F010F091C1F000000000010A1C000310F3500000586000000000000000000000000005C120A001406101000140612490014061012001406125200000005040000000502001015012000000005080010001511001406122000140612600014061247001406130900140610070010150141000514001700140612510010150064007A907C0D0A")); } diff --git a/test/org/traccar/protocol/UlbotechProtocolDecoderTest.java b/test/org/traccar/protocol/UlbotechProtocolDecoderTest.java index cb2a06ba9..7726949ac 100644 --- a/test/org/traccar/protocol/UlbotechProtocolDecoderTest.java +++ b/test/org/traccar/protocol/UlbotechProtocolDecoderTest.java @@ -10,7 +10,7 @@ public class UlbotechProtocolDecoderTest extends ProtocolTest { UlbotechProtocolDecoder decoder = new UlbotechProtocolDecoder(new UlbotechProtocol()); - verifyNothing(decoder, buffer( + verifyNull(decoder, buffer( "*TS01,353323081464660#")); verifyAttributes(decoder, buffer( @@ -43,7 +43,7 @@ public class UlbotechProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, binary( "f8010103515790566431569e5fbb9d010e015ee2b906bde4a000000000009f03040a4000000404000115fe05060340173f22030711310583410c0000310d00312f834131000008040000b78c09077320290082c021100101120af8")); - verifyNothing(decoder, buffer( + verifyNull(decoder, buffer( "*TS01,354043051389460#")); verifyPosition(decoder, binary( diff --git a/test/org/traccar/protocol/UproProtocolDecoderTest.java b/test/org/traccar/protocol/UproProtocolDecoderTest.java index 270caeab5..42e3d16cf 100644 --- a/test/org/traccar/protocol/UproProtocolDecoderTest.java +++ b/test/org/traccar/protocol/UproProtocolDecoderTest.java @@ -23,7 +23,7 @@ public class UproProtocolDecoderTest extends ProtocolTest { "*MG201693502000034964,AB&A0800253335360507036975710000091116&P0730000032d2a94d&B0000000000&N13&Z12&U_P\0\0\0\u0004\0\0\0\0\0\0\0\0\0\0"), position("2016-11-09 08:00:25.000", true, -33.58934, -70.61626)); - verifyNothing(decoder, buffer( + verifyNull(decoder, buffer( "*MG20113800138000,AH")); verifyPosition(decoder, buffer( diff --git a/test/org/traccar/protocol/V680ProtocolDecoderTest.java b/test/org/traccar/protocol/V680ProtocolDecoderTest.java index f68497304..bc60e7380 100644 --- a/test/org/traccar/protocol/V680ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/V680ProtocolDecoderTest.java @@ -20,7 +20,7 @@ public class V680ProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "#355488020168617##1#0000#AUT#01##1834.770100,E,5302.742800,N,0.62,0.00#310316#211537.000##")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "#353588102019155")); verifyPosition(decoder, text( @@ -48,7 +48,7 @@ public class V680ProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "#356823031236214##0#0000#AUT#1#V#01904.5491,E,6941.0085,N,000.09,248#170513#160140")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "#353588550032869##1#0000#AUT#01#72400401cd01a5#00000.0000,E,0000.0000,N,0.00,#000000#000000.000")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/VisiontekProtocolDecoderTest.java b/test/org/traccar/protocol/VisiontekProtocolDecoderTest.java index f45ff714b..91043d892 100644 --- a/test/org/traccar/protocol/VisiontekProtocolDecoderTest.java +++ b/test/org/traccar/protocol/VisiontekProtocolDecoderTest.java @@ -16,7 +16,7 @@ public class VisiontekProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "$1,VMC,358072044271838,26,10,15,10,43,20,17.066418N,080.395667E,000.0,285,00.8,0074,6390,0,0,0,0,0,0,0,0,00.00,00.00,00,00,0000,12.7,4.0,24,10,0000000000000,A,0")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$1,VMC,358072044271838,25,10,15,09,19,40,00.0000000,000.0000000,000.0,000,00.0,0000,6070,0,0,0,0,0,0,0,0,00.00,00.00,00,00,0000,12.5,4.0,99,00,0000000000000,V,0")); verifyPosition(decoder, text( @@ -26,10 +26,10 @@ public class VisiontekProtocolDecoderTest extends ProtocolTest { "$1,AP09BU9397,861785006462448,20,06,14,15,03,28,17267339N,078279407E,060.0,073,0550,11,0,1,0,0,1,1,26,A,0000000000"), position("2014-06-20 15:03:28.000", true, 17.44556, 78.46567)); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$1,AP09BU9397,861785006462448,20,06,14,15,03,28,000000000,0000000000,000.0,000,0000,00,0,1,0,0,1,1,24,V,0000000000")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "$1,1234567890,02,06,11,17,07,45,00000000,000000000,00.0,0,0,V")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/WatchProtocolDecoderTest.java b/test/org/traccar/protocol/WatchProtocolDecoderTest.java index 653fc3ebc..5a67d8013 100644 --- a/test/org/traccar/protocol/WatchProtocolDecoderTest.java +++ b/test/org/traccar/protocol/WatchProtocolDecoderTest.java @@ -29,7 +29,7 @@ public class WatchProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "[3G*4700222306*011F*UD2,120316,140444,A,48.779045,N, 9.1574736,E,0.57,12.8,0.0,7,28,77,0,0,00000000,2,2,262,1,21041,9067,121,21041,5981,116,5,WG-Superlativ,34:31:c4:c8:a9:22,-67,EasyBox-28E858,18:83:bf:28:e8:f4,-70,MoMaXXg,be:05:43:b7:19:15,-72,MoMaXX2,bc:05:43:b7:19:15,-72,Gastzugang,18:83:bf:28:e8:f5,-72")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "[SG*9081000548*0009*LK,0,100")); verifyPosition(decoder, text( @@ -38,13 +38,13 @@ public class WatchProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "[3G*2256002206*0079*UD2,100116,153723,A,38.000000,N,-9.000000,W,0.44,299.3,0.0,7,100,86,0,0,00000008,2,0,268,3,3010,51042,146,3010,51043,132]")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "[3G*8800000015*0003*TKQ")); verifyPosition(decoder, text( "[3G*4700186508*00B1*UD,301015,084840,V,45.853100,N,14.6224899,E,0.00,0.0,0.0,0,84,61,0,11,00000008,7,255,293,70,60,6453,139,60,6432,139,60,6431,132,60,6457,127,60,16353,126,60,6451,121,60,16352,118")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "[SG*8800000015*0002*LK")); verifyAttributes(decoder, text( diff --git a/test/org/traccar/protocol/WialonProtocolDecoderTest.java b/test/org/traccar/protocol/WialonProtocolDecoderTest.java index 79eb2d009..4e73c7d49 100644 --- a/test/org/traccar/protocol/WialonProtocolDecoderTest.java +++ b/test/org/traccar/protocol/WialonProtocolDecoderTest.java @@ -10,13 +10,13 @@ public class WialonProtocolDecoderTest extends ProtocolTest { WialonProtocolDecoder decoder = new WialonProtocolDecoder(new WialonProtocol()); - verifyNothing(decoder, text( + verifyNull(decoder, text( "#L#123456789012345;test")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "#L#2002;NA")); - verifyNothing(decoder, text( + verifyNull(decoder, text( "#P#")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/WondexProtocolDecoderTest.java b/test/org/traccar/protocol/WondexProtocolDecoderTest.java index bf85c71ba..c68b41671 100644 --- a/test/org/traccar/protocol/WondexProtocolDecoderTest.java +++ b/test/org/traccar/protocol/WondexProtocolDecoderTest.java @@ -54,7 +54,7 @@ public class WondexProtocolDecoderTest extends ProtocolTest { verifyNotNull(decoder, buffer( "$ERR:GETLOCATION=1")); - verifyNothing(decoder, binary( + verifyNull(decoder, binary( "d0d70b0001ca9a3b")); } diff --git a/test/org/traccar/protocol/XexunProtocolDecoderTest.java b/test/org/traccar/protocol/XexunProtocolDecoderTest.java index e94fb62e8..c1e160192 100644 --- a/test/org/traccar/protocol/XexunProtocolDecoderTest.java +++ b/test/org/traccar/protocol/XexunProtocolDecoderTest.java @@ -55,7 +55,7 @@ public class XexunProtocolDecoderTest extends ProtocolTest { decoder = new XexunProtocolDecoder(new XexunProtocol(), true); - verifyNothing(decoder, text( + verifyNull(decoder, text( ",+48606717068,,L,, imei:012207005047292,,,F:4.28V,1,52,11565,247,01,000E,1FC5")); verifyPosition(decoder, text( diff --git a/test/org/traccar/protocol/YwtProtocolDecoderTest.java b/test/org/traccar/protocol/YwtProtocolDecoderTest.java index f79e8a49b..96031d510 100644 --- a/test/org/traccar/protocol/YwtProtocolDecoderTest.java +++ b/test/org/traccar/protocol/YwtProtocolDecoderTest.java @@ -10,7 +10,7 @@ public class YwtProtocolDecoderTest extends ProtocolTest { YwtProtocolDecoder decoder = new YwtProtocolDecoder(new YwtProtocol()); - verifyNothing(decoder, text( + verifyNull(decoder, text( "%SN,0417061042:0,0,140117041203,404")); verifyPosition(decoder, text( |