From ae32084f88df4436e1a2cdcb346ff1e7e286e369 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 17 Oct 2018 16:52:38 +1300 Subject: Avoid protocol classes in tests --- src/org/traccar/BaseProtocolDecoder.java | 4 +++- test/org/traccar/protocol/AdmProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/AisProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/AlematicsProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/AnytrekProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/ApelProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/AplicomProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/AppelloProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/AppletProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/AquilaProtocolDecoderTest.java | 4 ++-- test/org/traccar/protocol/Ardi01ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/ArknavProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/ArknavX8ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/ArnaviProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/AstraProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/At2000ProtocolDecoderTest.java | 10 +++++----- test/org/traccar/protocol/AtrackProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/AuroProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/AustinNbProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/AutoFonProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/AutoGradeProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/AutoTrackProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/AvemaProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/Avl301ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/BceProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/BlackKiteProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/BoxProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/CalAmpProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/CarTrackProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/CarscopProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/CastelProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/CautelaProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/CellocatorProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/CguardProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/CityeasyProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/ContinentalProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/CradlepointProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/DishaProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/DmtHttpProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/DmtProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/DwayProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/EasyTrackProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/EelinkProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/EgtsProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/EnforaProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/EsealProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/EskyProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/ExtremTracProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/FifotrackProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/FlespiProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/FlexCommProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/FlextrackProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/FoxProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/FreedomProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/FreematicsProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/GalileoProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/GatorProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/GenxProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/Gl100ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/Gl200BinaryProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/Gl200TextProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/GlobalSatProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/GnxProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/GoSafeProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/GotopProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/Gps056ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/Gps103ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/GpsGateProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/GpsMarkerProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/GpsmtaProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/GranitProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/Gt02ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/Gt06ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/Gt30ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/H02ProtocolDecoderTest.java | 4 ++-- test/org/traccar/protocol/HaicomProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/HomtecsProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/HuaShengProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/HuabaoProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/HunterProProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/IdplProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/IntellitracProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/ItsProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/Ivt401ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/JpKorjarProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/Jt600ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/KenjiProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/KhdProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/L100ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/LaipacProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/M2cProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/M2mProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/MaestroProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/ManPowerProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/MegastekProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/MeiligaoProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/MeitrackProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/MilesmateProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/MiniFinderProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/MtxProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/MxtProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/NavigilProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/NavisProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/NoranProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/NvsProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/ObdDongleProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/OigoProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/OkoProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/OpenGtsProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/OrionProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/OsmAndProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/OwnTracksProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/PathAwayProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/PiligrimProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/PretraceProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/PricolProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/ProgressProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/Pt3000ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/Pt502ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/Pt60ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/RaveonProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/RecodaProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/RetranslatorProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/RitiProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/RoboTrackProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/RuptelaProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/SabertekProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/SanavProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/SigfoxProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/SiwiProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/SkypatrolProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/SmartSoleProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/SmokeyProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/SpotProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/StarLinkProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/Stl060ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/SuntechProtocolDecoderTest.java | 4 ++-- test/org/traccar/protocol/SupermateProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/SviasProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/T55ProtocolDecoderTest.java | 4 ++-- test/org/traccar/protocol/T57ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/T800xProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/TaipProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/TekProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/TelemaxProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/TelicProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/ThinkRaceProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/Tk102ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/Tk103ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/TlvProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/TmgProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/TopflytechProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/TotemProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/Tr20ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/Tr900ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/TrackboxProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/TrakMateProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/TramigoProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/TrvProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/Tt8850ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/TytanProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/TzoneProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/UlbotechProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/UproProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/V680ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/VisiontekProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/Vt200ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/VtfmsProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/WatchProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/WialonProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/WondexProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/WristbandProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/XirgoProtocolDecoderTest.java | 4 ++-- test/org/traccar/protocol/Xt013ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/Xt2400ProtocolDecoderTest.java | 2 +- test/org/traccar/protocol/YwtProtocolDecoderTest.java | 2 +- 177 files changed, 188 insertions(+), 186 deletions(-) diff --git a/src/org/traccar/BaseProtocolDecoder.java b/src/org/traccar/BaseProtocolDecoder.java index 2914fc3ac..8f495900a 100644 --- a/src/org/traccar/BaseProtocolDecoder.java +++ b/src/org/traccar/BaseProtocolDecoder.java @@ -39,6 +39,8 @@ public abstract class BaseProtocolDecoder extends ExtendedObjectDecoder { private static final Logger LOGGER = LoggerFactory.getLogger(BaseProtocolDecoder.class); + private static final String PROTOCOL_UNKNOWN = "unknown"; + private final Config config = Context.getConfig(); private final IdentityManager identityManager = Context.getIdentityManager(); private final ConnectionManager connectionManager = Context.getConnectionManager(); @@ -50,7 +52,7 @@ public abstract class BaseProtocolDecoder extends ExtendedObjectDecoder { } public String getProtocolName() { - return protocol != null ? protocol.getName() : null; + return protocol != null ? protocol.getName() : PROTOCOL_UNKNOWN; } public String getServer(Channel channel) { diff --git a/test/org/traccar/protocol/AdmProtocolDecoderTest.java b/test/org/traccar/protocol/AdmProtocolDecoderTest.java index 86ce1c8f8..bd4624974 100644 --- a/test/org/traccar/protocol/AdmProtocolDecoderTest.java +++ b/test/org/traccar/protocol/AdmProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class AdmProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - AdmProtocolDecoder decoder = new AdmProtocolDecoder(new AdmProtocol()); + AdmProtocolDecoder decoder = new AdmProtocolDecoder(null); verifyNull(decoder, binary( "010042033836313331313030323639343838320501000000000000000000000000000000000000000000000000000000000000000000000000000000000000000073")); diff --git a/test/org/traccar/protocol/AisProtocolDecoderTest.java b/test/org/traccar/protocol/AisProtocolDecoderTest.java index a6c9d4c84..9cb9f695a 100644 --- a/test/org/traccar/protocol/AisProtocolDecoderTest.java +++ b/test/org/traccar/protocol/AisProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class AisProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - AisProtocolDecoder decoder = new AisProtocolDecoder(new AisProtocol()); + AisProtocolDecoder decoder = new AisProtocolDecoder(null); verifyPositions(decoder, text( "!AIVDM,2,1,8,A,53UlSb01l>Ei=H4KF218PTpv222222222222221?8h=766gB0")); diff --git a/test/org/traccar/protocol/FreedomProtocolDecoderTest.java b/test/org/traccar/protocol/FreedomProtocolDecoderTest.java index 40cf43326..b2fc1fd8d 100644 --- a/test/org/traccar/protocol/FreedomProtocolDecoderTest.java +++ b/test/org/traccar/protocol/FreedomProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class FreedomProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - FreedomProtocolDecoder decoder = new FreedomProtocolDecoder(new FreedomProtocol()); + FreedomProtocolDecoder decoder = new FreedomProtocolDecoder(null); verifyPosition(decoder, text( "IMEI,353358011714362,2014/05/22, 20:49:32, N, Lat:4725.9624, E, Lon:01912.5483, Spd:5.05"), diff --git a/test/org/traccar/protocol/FreematicsProtocolDecoderTest.java b/test/org/traccar/protocol/FreematicsProtocolDecoderTest.java index 90150d76d..69a585076 100644 --- a/test/org/traccar/protocol/FreematicsProtocolDecoderTest.java +++ b/test/org/traccar/protocol/FreematicsProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class FreematicsProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - FreematicsProtocolDecoder decoder = new FreematicsProtocolDecoder(new FreematicsProtocol()); + FreematicsProtocolDecoder decoder = new FreematicsProtocolDecoder(null); verifyNull(decoder, text( "0#EV=1,TS=23930,ID=ID1C6606C40A24,SK=TEST_SERVER_KEY*49")); diff --git a/test/org/traccar/protocol/GalileoProtocolDecoderTest.java b/test/org/traccar/protocol/GalileoProtocolDecoderTest.java index be009cf91..74612caab 100644 --- a/test/org/traccar/protocol/GalileoProtocolDecoderTest.java +++ b/test/org/traccar/protocol/GalileoProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class GalileoProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - GalileoProtocolDecoder decoder = new GalileoProtocolDecoder(new GalileoProtocol()); + GalileoProtocolDecoder decoder = new GalileoProtocolDecoder(null); verifyPositions(decoder, binary( "011801018202130338363833343530333230343234323604640010a406207caa9f5b300c830a7901ca0ec802330000000034b802350540003e41703f422b1043234504004600e09000000000a000a100a200a300a400a500a600a700a800a900aa00ab00ac00ad00ae00af00b00000b10000b20000b30000b40000b50000b60000b70000b80000b90000c000000000c100000000c200000000c300000000c400c500c600c700c800c900ca00cb00cc00cd00ce00cf00d000d100d200d4d3140000d60000d70000d80000d90000da0000db00000000dc00000000dd00000000de00000000df00000000f000000000f100000000f200000000f300000000f400000000f500000000f600000000f700000000f800000000f9000000008960")); diff --git a/test/org/traccar/protocol/GatorProtocolDecoderTest.java b/test/org/traccar/protocol/GatorProtocolDecoderTest.java index 360a3abed..e2be99cb9 100644 --- a/test/org/traccar/protocol/GatorProtocolDecoderTest.java +++ b/test/org/traccar/protocol/GatorProtocolDecoderTest.java @@ -17,7 +17,7 @@ public class GatorProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - GatorProtocolDecoder decoder = new GatorProtocolDecoder(new GatorProtocol()); + GatorProtocolDecoder decoder = new GatorProtocolDecoder(null); verifyAttributes(decoder, binary( "2424800026364101b31608041108380273453415301532000000008000010000122800000124000000c40d")); diff --git a/test/org/traccar/protocol/GenxProtocolDecoderTest.java b/test/org/traccar/protocol/GenxProtocolDecoderTest.java index ee813b841..373c8c49e 100644 --- a/test/org/traccar/protocol/GenxProtocolDecoderTest.java +++ b/test/org/traccar/protocol/GenxProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class GenxProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - GenxProtocolDecoder decoder = new GenxProtocolDecoder(new GenxProtocol()); + GenxProtocolDecoder decoder = new GenxProtocolDecoder(null); decoder.setReportColumns("28,2,3,4,13,17,10,23,27,11,7,8,46,56,59,70,74,75,77,89,90,93,99,107,112,113,114,176,175,178,181,182"); diff --git a/test/org/traccar/protocol/Gl100ProtocolDecoderTest.java b/test/org/traccar/protocol/Gl100ProtocolDecoderTest.java index e89b3c190..ffafcd7b1 100644 --- a/test/org/traccar/protocol/Gl100ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Gl100ProtocolDecoderTest.java @@ -9,7 +9,7 @@ public class Gl100ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Gl100ProtocolDecoder decoder = new Gl100ProtocolDecoder(new Gl100Protocol()); + Gl100ProtocolDecoder decoder = new Gl100ProtocolDecoder(null); verifyPosition(decoder, text( "+RESP:GTLGL,359464030492644,1,2,1,0,0.4,0,299.7,1,5.455551,51.449776,20160311083229,0204,0016,03EC,BD94,00,0036,0102090501")); diff --git a/test/org/traccar/protocol/Gl200BinaryProtocolDecoderTest.java b/test/org/traccar/protocol/Gl200BinaryProtocolDecoderTest.java index ebcd4139b..e6fb98340 100644 --- a/test/org/traccar/protocol/Gl200BinaryProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Gl200BinaryProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class Gl200BinaryProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Gl200BinaryProtocolDecoder decoder = new Gl200BinaryProtocolDecoder(new Gl200Protocol()); + Gl200BinaryProtocolDecoder decoder = new Gl200BinaryProtocolDecoder(null); verifyPosition(decoder, binary( "2b4556542d00fc1fbf0063450102020956325403000343056437f8220700000200000000010000160100f2007eff75a1f0025c6b1a07e1080108241a02680003189c1ac500000000000002100800000000000000000007e1080108241a19e24e4e0d0a")); diff --git a/test/org/traccar/protocol/Gl200TextProtocolDecoderTest.java b/test/org/traccar/protocol/Gl200TextProtocolDecoderTest.java index 3db155e70..a32cec1d4 100644 --- a/test/org/traccar/protocol/Gl200TextProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Gl200TextProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class Gl200TextProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Gl200TextProtocolDecoder decoder = new Gl200TextProtocolDecoder(new Gl200Protocol()); + Gl200TextProtocolDecoder decoder = new Gl200TextProtocolDecoder(null); verifyPositions(decoder, buffer( "+RESP:GTSTR,440502,866427030112088,GL530,0,0,2,,100,3,0.6,0,127.5,2.413963,48.877096,20180704180102,0208,0001,0310,E625,,,0000,20180704180100,004C$")); diff --git a/test/org/traccar/protocol/GlobalSatProtocolDecoderTest.java b/test/org/traccar/protocol/GlobalSatProtocolDecoderTest.java index da81e5549..9746845a0 100644 --- a/test/org/traccar/protocol/GlobalSatProtocolDecoderTest.java +++ b/test/org/traccar/protocol/GlobalSatProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class GlobalSatProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - GlobalSatProtocolDecoder decoder = new GlobalSatProtocolDecoder(new GlobalSatProtocol()); + GlobalSatProtocolDecoder decoder = new GlobalSatProtocolDecoder(null); verifyNull(decoder, text( "GSh,131826789036289,3,M,ea04*3d")); diff --git a/test/org/traccar/protocol/GnxProtocolDecoderTest.java b/test/org/traccar/protocol/GnxProtocolDecoderTest.java index a701d6bfd..91aca50c8 100644 --- a/test/org/traccar/protocol/GnxProtocolDecoderTest.java +++ b/test/org/traccar/protocol/GnxProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class GnxProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - GnxProtocolDecoder decoder = new GnxProtocolDecoder(new GnxProtocol()); + GnxProtocolDecoder decoder = new GnxProtocolDecoder(null); verifyPosition(decoder, text( "$GNX_MIF,865733022354161,143,0,172642,180316,172642,180316,1,13.034581,N,080.234521,E,0,05396274,ROUTE_2#########,Deo ############,GNX04008,B0*")); diff --git a/test/org/traccar/protocol/GoSafeProtocolDecoderTest.java b/test/org/traccar/protocol/GoSafeProtocolDecoderTest.java index d41d388b9..16ec1e68a 100644 --- a/test/org/traccar/protocol/GoSafeProtocolDecoderTest.java +++ b/test/org/traccar/protocol/GoSafeProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class GoSafeProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - GoSafeProtocolDecoder decoder = new GoSafeProtocolDecoder(new GoSafeProtocol()); + GoSafeProtocolDecoder decoder = new GoSafeProtocolDecoder(null); verifyPositions(decoder, text( "*GS06,359913060650380,152248050718,,SYS:G3C;V1.38;V05,GPS:A;10;N31.914370;E35.914640;0;0,COT:689,ADC:0.18;3.55,DTT:4025;E6;0;0;0;1#")); diff --git a/test/org/traccar/protocol/GotopProtocolDecoderTest.java b/test/org/traccar/protocol/GotopProtocolDecoderTest.java index f38cf98ef..ca3ddfda8 100644 --- a/test/org/traccar/protocol/GotopProtocolDecoderTest.java +++ b/test/org/traccar/protocol/GotopProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class GotopProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - GotopProtocolDecoder decoder = new GotopProtocolDecoder(new GotopProtocol()); + GotopProtocolDecoder decoder = new GotopProtocolDecoder(null); verifyNull(decoder, text( "")); diff --git a/test/org/traccar/protocol/Gps056ProtocolDecoderTest.java b/test/org/traccar/protocol/Gps056ProtocolDecoderTest.java index 01d7cf56f..a6d0c024a 100644 --- a/test/org/traccar/protocol/Gps056ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Gps056ProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class Gps056ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Gps056ProtocolDecoder decoder = new Gps056ProtocolDecoder(new Gps056Protocol()); + Gps056ProtocolDecoder decoder = new Gps056ProtocolDecoder(null); verifyNull(decoder, buffer( "$$25LOGN_118624620337829462.1#")); diff --git a/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java b/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java index bd960a522..6e1612655 100644 --- a/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Gps103ProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class Gps103ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Gps103ProtocolDecoder decoder = new Gps103ProtocolDecoder(new Gps103Protocol()); + Gps103ProtocolDecoder decoder = new Gps103ProtocolDecoder(null); verifyAttributes(decoder, text( "imei:868683027758113,OBD,180905200218,,,,0,0,0.39%,70,9.41%,494,0.00,P0137,P0430,,;")); diff --git a/test/org/traccar/protocol/GpsGateProtocolDecoderTest.java b/test/org/traccar/protocol/GpsGateProtocolDecoderTest.java index bcccf874b..d35666b56 100644 --- a/test/org/traccar/protocol/GpsGateProtocolDecoderTest.java +++ b/test/org/traccar/protocol/GpsGateProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class GpsGateProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - GpsGateProtocolDecoder decoder = new GpsGateProtocolDecoder(new GpsGateProtocol()); + GpsGateProtocolDecoder decoder = new GpsGateProtocolDecoder(null); verifyPosition(decoder, text( "$FRCMD,0097,_SendMessage,,7618.51990,S,4002.26182,E,350.0,1.08,0.0,250816,183522.000,0*7F")); diff --git a/test/org/traccar/protocol/GpsMarkerProtocolDecoderTest.java b/test/org/traccar/protocol/GpsMarkerProtocolDecoderTest.java index 64016b404..d6ba11cb7 100644 --- a/test/org/traccar/protocol/GpsMarkerProtocolDecoderTest.java +++ b/test/org/traccar/protocol/GpsMarkerProtocolDecoderTest.java @@ -9,7 +9,7 @@ public class GpsMarkerProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - GpsMarkerProtocolDecoder decoder = new GpsMarkerProtocolDecoder(new GpsMarkerProtocol()); + GpsMarkerProtocolDecoder decoder = new GpsMarkerProtocolDecoder(null); verifyPosition(decoder, text( "$GM23D863071014445404T260816142611N55441051E037325071033063C0530304#")); diff --git a/test/org/traccar/protocol/GpsmtaProtocolDecoderTest.java b/test/org/traccar/protocol/GpsmtaProtocolDecoderTest.java index 00d30a357..438d0fb3a 100644 --- a/test/org/traccar/protocol/GpsmtaProtocolDecoderTest.java +++ b/test/org/traccar/protocol/GpsmtaProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class GpsmtaProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - GpsmtaProtocolDecoder decoder = new GpsmtaProtocolDecoder(new GpsmtaProtocol()); + GpsmtaProtocolDecoder decoder = new GpsmtaProtocolDecoder(null); verifyPosition(decoder, text( "3085a94ef459 1446536867 49.81621 24.054207 1 0 22 0 10 12 24 0 0")); diff --git a/test/org/traccar/protocol/GranitProtocolDecoderTest.java b/test/org/traccar/protocol/GranitProtocolDecoderTest.java index 21f913dbe..fc75b2a53 100644 --- a/test/org/traccar/protocol/GranitProtocolDecoderTest.java +++ b/test/org/traccar/protocol/GranitProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class GranitProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - GranitProtocolDecoder decoder = new GranitProtocolDecoder(new GranitProtocol()); + GranitProtocolDecoder decoder = new GranitProtocolDecoder(null); verifyPositions(decoder, binary( "2b444441547e8400c500040130050c43495808002839aee3150200000000640000000000000008002839aee3150200000000640000000000000008002839aee3150200000000640000000000000008002839aee3150200000000640000000000000008002839aee3150200000000640000000000000008002839aee3150200000000640000000000000014002a37420d0a")); diff --git a/test/org/traccar/protocol/Gt02ProtocolDecoderTest.java b/test/org/traccar/protocol/Gt02ProtocolDecoderTest.java index c957acd6c..f9b8f6509 100644 --- a/test/org/traccar/protocol/Gt02ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Gt02ProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class Gt02ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Gt02ProtocolDecoder decoder = new Gt02ProtocolDecoder(new Gt02Protocol()); + Gt02ProtocolDecoder decoder = new Gt02ProtocolDecoder(null); verifyAttributes(decoder, binary( "6868150000035889905895258400831c07415045584f4b210d0a")); diff --git a/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java index e7635d63f..44b4e8a8d 100644 --- a/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Gt06ProtocolDecoder decoder = new Gt06ProtocolDecoder(new Gt06Protocol()); + Gt06ProtocolDecoder decoder = new Gt06ProtocolDecoder(null); verifyNull(decoder, binary( "787805120099abec0d0a")); diff --git a/test/org/traccar/protocol/Gt30ProtocolDecoderTest.java b/test/org/traccar/protocol/Gt30ProtocolDecoderTest.java index 7b81b1ebe..cb792ba09 100644 --- a/test/org/traccar/protocol/Gt30ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Gt30ProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class Gt30ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Gt30ProtocolDecoder decoder = new Gt30ProtocolDecoder(new Gt30Protocol()); + Gt30ProtocolDecoder decoder = new Gt30ProtocolDecoder(null); verifyPosition(decoder, text( "$$005D3037811014 9955102834.000,A,3802.8629,N,02349.7163,E,0.00,,060117,,*13|1.3|26225BD")); diff --git a/test/org/traccar/protocol/H02ProtocolDecoderTest.java b/test/org/traccar/protocol/H02ProtocolDecoderTest.java index 1a49b4bfb..acfb96c82 100644 --- a/test/org/traccar/protocol/H02ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/H02ProtocolDecoderTest.java @@ -9,7 +9,7 @@ public class H02ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - H02ProtocolDecoder decoder = new H02ProtocolDecoder(new H02Protocol()); + H02ProtocolDecoder decoder = new H02ProtocolDecoder(null); verifyPosition(decoder, binary( "2435248308419329301047591808172627335900074412294E024138FEFFFFFFFF01120064BA73005ECC")); @@ -239,7 +239,7 @@ public class H02ProtocolDecoderTest extends ProtocolTest { @Test public void testDecodeStatus() throws Exception { - H02ProtocolDecoder decoder = new H02ProtocolDecoder(new H02Protocol()); + H02ProtocolDecoder decoder = new H02ProtocolDecoder(null); verifyAttribute(decoder, buffer( "*HQ,2705171109,V1,213324,A,5002.5849,N,01433.7822,E,0.00,000,140613,FFFFFFFF#"), diff --git a/test/org/traccar/protocol/HaicomProtocolDecoderTest.java b/test/org/traccar/protocol/HaicomProtocolDecoderTest.java index 785366328..6d879daf2 100644 --- a/test/org/traccar/protocol/HaicomProtocolDecoderTest.java +++ b/test/org/traccar/protocol/HaicomProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class HaicomProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - HaicomProtocolDecoder decoder = new HaicomProtocolDecoder(new HaicomProtocol()); + HaicomProtocolDecoder decoder = new HaicomProtocolDecoder(null); verifyPosition(decoder, text( "$GPRS012497007097169,T100001,150618,230031,5402267400332464,0004,2014,000001,,,1,00#V040*"), diff --git a/test/org/traccar/protocol/HomtecsProtocolDecoderTest.java b/test/org/traccar/protocol/HomtecsProtocolDecoderTest.java index b75f1b5dd..9acf2ce87 100644 --- a/test/org/traccar/protocol/HomtecsProtocolDecoderTest.java +++ b/test/org/traccar/protocol/HomtecsProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class HomtecsProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - HomtecsProtocolDecoder decoder = new HomtecsProtocolDecoder(new HomtecsProtocol()); + HomtecsProtocolDecoder decoder = new HomtecsProtocolDecoder(null); verifyNull(decoder, text( "MDS0001_R6d1821f7,170323,143601.00,04,,,,,,,,,")); diff --git a/test/org/traccar/protocol/HuaShengProtocolDecoderTest.java b/test/org/traccar/protocol/HuaShengProtocolDecoderTest.java index 3263c5ad3..319d34e4c 100644 --- a/test/org/traccar/protocol/HuaShengProtocolDecoderTest.java +++ b/test/org/traccar/protocol/HuaShengProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class HuaShengProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - HuaShengProtocolDecoder decoder = new HuaShengProtocolDecoder(new HuaShengProtocol()); + HuaShengProtocolDecoder decoder = new HuaShengProtocolDecoder(null); verifyNull(decoder, binary( "c0010c003c0002000000000044020010a0014f42445f3347315f56322e320013a0043335353835353035313032303536360006a08700000006a0a105c9c0")); diff --git a/test/org/traccar/protocol/HuabaoProtocolDecoderTest.java b/test/org/traccar/protocol/HuabaoProtocolDecoderTest.java index 2618c8c9d..8f8b5fe24 100644 --- a/test/org/traccar/protocol/HuabaoProtocolDecoderTest.java +++ b/test/org/traccar/protocol/HuabaoProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class HuabaoProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - HuabaoProtocolDecoder decoder = new HuabaoProtocolDecoder(new HuabaoProtocol()); + HuabaoProtocolDecoder decoder = new HuabaoProtocolDecoder(null); verifyNull(decoder, binary( "7E01000021013345678906000F002C012F373031313142534A2D4D3742203030303030303001D4C1423838383838B47E")); diff --git a/test/org/traccar/protocol/HunterProProtocolDecoderTest.java b/test/org/traccar/protocol/HunterProProtocolDecoderTest.java index b90ff4624..f0697f423 100644 --- a/test/org/traccar/protocol/HunterProProtocolDecoderTest.java +++ b/test/org/traccar/protocol/HunterProProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class HunterProProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - HunterProProtocolDecoder decoder = new HunterProProtocolDecoder(new HunterProProtocol()); + HunterProProtocolDecoder decoder = new HunterProProtocolDecoder(null); verifyPosition(decoder, text( ">0002<$GPRMC,170559.000,A,0328.3045,N,07630.0735,W,0.73,266.16,200816,,,A77, s000078015180\",0MD")); diff --git a/test/org/traccar/protocol/IdplProtocolDecoderTest.java b/test/org/traccar/protocol/IdplProtocolDecoderTest.java index 4340ebc3d..d211d80ce 100644 --- a/test/org/traccar/protocol/IdplProtocolDecoderTest.java +++ b/test/org/traccar/protocol/IdplProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class IdplProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - IdplProtocolDecoder decoder = new IdplProtocolDecoder(new IdplProtocol()); + IdplProtocolDecoder decoder = new IdplProtocolDecoder(null); verifyPosition(decoder, text( "*ID1,863071011086474,210314,153218,A,1831.4577,N,07351.1433,E,0.79,240.64,9,20,A,1,4.20,0,1,01,1,0,0,A01,R,935D#"), diff --git a/test/org/traccar/protocol/IntellitracProtocolDecoderTest.java b/test/org/traccar/protocol/IntellitracProtocolDecoderTest.java index 390017f17..00b7de094 100644 --- a/test/org/traccar/protocol/IntellitracProtocolDecoderTest.java +++ b/test/org/traccar/protocol/IntellitracProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class IntellitracProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - IntellitracProtocolDecoder decoder = new IntellitracProtocolDecoder(new IntellitracProtocol()); + IntellitracProtocolDecoder decoder = new IntellitracProtocolDecoder(null); verifyNull(decoder, text( "$OK:TRACKING")); diff --git a/test/org/traccar/protocol/ItsProtocolDecoderTest.java b/test/org/traccar/protocol/ItsProtocolDecoderTest.java index 91ce333d6..3ab305b54 100644 --- a/test/org/traccar/protocol/ItsProtocolDecoderTest.java +++ b/test/org/traccar/protocol/ItsProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class ItsProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - ItsProtocolDecoder decoder = new ItsProtocolDecoder(new ItsProtocol()); + ItsProtocolDecoder decoder = new ItsProtocolDecoder(null); verifyPosition(decoder, text( "$,04,XYZ123,0.0.1,TA,16,L,861359034100626,MH12AB1234,1,14,10,2018,04,50,52,018.489624,N,073.855980,E,000.0,039.86,13,584.1,01.11,00.75,AIRTEL,1,1,00.0,4.1,1,C,15,404,90,0c23,781a,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,1000,01,000005,13b75499,")); diff --git a/test/org/traccar/protocol/Ivt401ProtocolDecoderTest.java b/test/org/traccar/protocol/Ivt401ProtocolDecoderTest.java index d8a67ad7b..b0b416891 100644 --- a/test/org/traccar/protocol/Ivt401ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Ivt401ProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class Ivt401ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Ivt401ProtocolDecoder decoder = new Ivt401ProtocolDecoder(new Ivt401Protocol()); + Ivt401ProtocolDecoder decoder = new Ivt401ProtocolDecoder(null); verifyPosition(decoder, text( "(TLA,356917051007891,190118,090211,+16.986606,+82.242416,0,66,4,13,1,5,000,00,0.0,11.59,8.30,37.77,0.0,1,1.02,0,0,208,0,0,0,0,000000000,0,0,0,0,0,0,0,1,8654604,5,9,114)")); diff --git a/test/org/traccar/protocol/JpKorjarProtocolDecoderTest.java b/test/org/traccar/protocol/JpKorjarProtocolDecoderTest.java index c64be017f..8179a2bae 100644 --- a/test/org/traccar/protocol/JpKorjarProtocolDecoderTest.java +++ b/test/org/traccar/protocol/JpKorjarProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class JpKorjarProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - JpKorjarProtocolDecoder decoder = new JpKorjarProtocolDecoder(new JpKorjarProtocol()); + JpKorjarProtocolDecoder decoder = new JpKorjarProtocolDecoder(null); verifyPosition(decoder, text( "KORJAR.PL,329587014519383,160910144240,52.247254N,021.013375E,0.00,1,F:4.18V,1 260 01 794B 3517,")); diff --git a/test/org/traccar/protocol/Jt600ProtocolDecoderTest.java b/test/org/traccar/protocol/Jt600ProtocolDecoderTest.java index 3baa17667..2bb4b0fa3 100644 --- a/test/org/traccar/protocol/Jt600ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Jt600ProtocolDecoderTest.java @@ -9,7 +9,7 @@ public class Jt600ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Jt600ProtocolDecoder decoder = new Jt600ProtocolDecoder(new Jt600Protocol()); + Jt600ProtocolDecoder decoder = new Jt600ProtocolDecoder(null); verifyPositions(decoder, binary( "2475801263981711002713061813333723501622090221558f012f0000002a070000000020c055b88552191f000f0f0f07")); diff --git a/test/org/traccar/protocol/KenjiProtocolDecoderTest.java b/test/org/traccar/protocol/KenjiProtocolDecoderTest.java index dcb5aea01..5596913c9 100755 --- a/test/org/traccar/protocol/KenjiProtocolDecoderTest.java +++ b/test/org/traccar/protocol/KenjiProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class KenjiProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - KenjiProtocolDecoder decoder = new KenjiProtocolDecoder(new KenjiProtocol()); + KenjiProtocolDecoder decoder = new KenjiProtocolDecoder(null); verifyPosition(decoder, text( ">C800000,M005004,O0000,I0002,D124057,A,S3137.2783,W05830.2978,T000.0,H254.3,Y240116,G06*17"), diff --git a/test/org/traccar/protocol/KhdProtocolDecoderTest.java b/test/org/traccar/protocol/KhdProtocolDecoderTest.java index 51f6f3700..21494014c 100644 --- a/test/org/traccar/protocol/KhdProtocolDecoderTest.java +++ b/test/org/traccar/protocol/KhdProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class KhdProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - KhdProtocolDecoder decoder = new KhdProtocolDecoder(new KhdProtocol()); + KhdProtocolDecoder decoder = new KhdProtocolDecoder(null); verifyNull(decoder, binary( "2929b1000605162935b80d")); diff --git a/test/org/traccar/protocol/L100ProtocolDecoderTest.java b/test/org/traccar/protocol/L100ProtocolDecoderTest.java index e03bc2c09..e86ea0e81 100644 --- a/test/org/traccar/protocol/L100ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/L100ProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class L100ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - L100ProtocolDecoder decoder = new L100ProtocolDecoder(new L100Protocol()); + L100ProtocolDecoder decoder = new L100ProtocolDecoder(null); verifyAttributes(decoder, text( "L,ATLOBD,866795030475584,03,7429,143344,130918,CAN,0101:00076100,0103:0200,0104:3C,0105:84,010A:XX,010B:19,010C:0F98,010D:22,010E:68,010F:5A,0110:XXXX,0111:28,011C:20,011F:XXXX,0121:0000,0122:XXXX,012F:XX,0162:XX,0132:XXXX,0133:61,0143:00A8,0145:0F,0146:XX,0147:30,0148:XX,0149:31,014A:18,014B:XX,014C:92,0151:XX,0131:00BB,0144:8000,015E:XXXX,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0902:XXXXXXXXXXXXXXX")); diff --git a/test/org/traccar/protocol/LaipacProtocolDecoderTest.java b/test/org/traccar/protocol/LaipacProtocolDecoderTest.java index 41925040e..31a0434bc 100644 --- a/test/org/traccar/protocol/LaipacProtocolDecoderTest.java +++ b/test/org/traccar/protocol/LaipacProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class LaipacProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - LaipacProtocolDecoder decoder = new LaipacProtocolDecoder(new LaipacProtocol()); + LaipacProtocolDecoder decoder = new LaipacProtocolDecoder(null); 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")); diff --git a/test/org/traccar/protocol/M2cProtocolDecoderTest.java b/test/org/traccar/protocol/M2cProtocolDecoderTest.java index f7ad07d67..65c9cc43b 100644 --- a/test/org/traccar/protocol/M2cProtocolDecoderTest.java +++ b/test/org/traccar/protocol/M2cProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class M2cProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - M2cProtocolDecoder decoder = new M2cProtocolDecoder(new M2cProtocol()); + M2cProtocolDecoder decoder = new M2cProtocolDecoder(null); verifyPositions(decoder, text( "[#M2C,2020,P1.B1.H3.F9.R1,102,864547034433966,1,L,0,20,171221,062016,28.647552,77.192841,0,0,0.0,0,0,64,255,11983,0,0,0,0.0,0,0,0,404,4,1F6,4D77,31,0*7524\r\n", diff --git a/test/org/traccar/protocol/M2mProtocolDecoderTest.java b/test/org/traccar/protocol/M2mProtocolDecoderTest.java index 114dfaf96..1c45c976b 100644 --- a/test/org/traccar/protocol/M2mProtocolDecoderTest.java +++ b/test/org/traccar/protocol/M2mProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class M2mProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - M2mProtocolDecoder decoder = new M2mProtocolDecoder(new M2mProtocol()); + M2mProtocolDecoder decoder = new M2mProtocolDecoder(null); verifyNull(decoder, binary( "235A3C2A2624215C287D70212A21254C7C6421220B0B0B")); diff --git a/test/org/traccar/protocol/MaestroProtocolDecoderTest.java b/test/org/traccar/protocol/MaestroProtocolDecoderTest.java index b480ad9b2..c7a7624c0 100644 --- a/test/org/traccar/protocol/MaestroProtocolDecoderTest.java +++ b/test/org/traccar/protocol/MaestroProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class MaestroProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - MaestroProtocolDecoder decoder = new MaestroProtocolDecoder(new MaestroProtocol()); + MaestroProtocolDecoder decoder = new MaestroProtocolDecoder(null); verifyPosition(decoder, text( "@353893040202807,705,UPV-02,1,13.2,17,0,0,16/09/11,11:42:49,0.352705,32.647918,1210.5,0.000000,35.33,11,0.8,0.000,0!\0")); diff --git a/test/org/traccar/protocol/ManPowerProtocolDecoderTest.java b/test/org/traccar/protocol/ManPowerProtocolDecoderTest.java index 5c2430954..1d6f80ae3 100644 --- a/test/org/traccar/protocol/ManPowerProtocolDecoderTest.java +++ b/test/org/traccar/protocol/ManPowerProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class ManPowerProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - ManPowerProtocolDecoder decoder = new ManPowerProtocolDecoder(new ManPowerProtocol()); + ManPowerProtocolDecoder decoder = new ManPowerProtocolDecoder(null); verifyPosition(decoder, text( "simei:352581250259539,,,tracker,51,24,1.73,130426023608,A,3201.5462,N,03452.2975,E,0.01,28B9,1DED,425,01,1x0x0*0x1*60x+2,en-us,"), diff --git a/test/org/traccar/protocol/MegastekProtocolDecoderTest.java b/test/org/traccar/protocol/MegastekProtocolDecoderTest.java index fab5df11b..1bf3dbd25 100644 --- a/test/org/traccar/protocol/MegastekProtocolDecoderTest.java +++ b/test/org/traccar/protocol/MegastekProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class MegastekProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - MegastekProtocolDecoder decoder = new MegastekProtocolDecoder(new MegastekProtocol()); + MegastekProtocolDecoder decoder = new MegastekProtocolDecoder(null); verifyPosition(decoder, text( "0132$MGV002,869152024261561,,S,310818,133945,V,3814.35442,N,02144.50662,E,00,00,00,99.9,,,44.2,,202,10,,,13,0,0,0,0,90,,,,11,100,Timer;!")); diff --git a/test/org/traccar/protocol/MeiligaoProtocolDecoderTest.java b/test/org/traccar/protocol/MeiligaoProtocolDecoderTest.java index 893b94653..da5a81144 100644 --- a/test/org/traccar/protocol/MeiligaoProtocolDecoderTest.java +++ b/test/org/traccar/protocol/MeiligaoProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class MeiligaoProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - MeiligaoProtocolDecoder decoder = new MeiligaoProtocolDecoder(new MeiligaoProtocol()); + MeiligaoProtocolDecoder decoder = new MeiligaoProtocolDecoder(null); verifyNull(decoder, binary( "24240012254748594772ff080002ffff0d0a")); diff --git a/test/org/traccar/protocol/MeitrackProtocolDecoderTest.java b/test/org/traccar/protocol/MeitrackProtocolDecoderTest.java index 96549d865..3e05d5243 100644 --- a/test/org/traccar/protocol/MeitrackProtocolDecoderTest.java +++ b/test/org/traccar/protocol/MeitrackProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class MeitrackProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - MeitrackProtocolDecoder decoder = new MeitrackProtocolDecoder(new MeitrackProtocol()); + MeitrackProtocolDecoder decoder = new MeitrackProtocolDecoder(null); verifyNull(decoder, binary( "242441313038362c3836343530373033313231393937342c4430302c3138303232343037323631345f4331453130395f4e31553144312e6a70672c31342c302cffd8ffdb008400140e0f120f0d14121012171514181e32211e1c1c1e3d2c2e243249404c4b47404645505a736250556d5645466488656d777b8182814e608d978c7d96737e817c011517171e1a1e3b21213b7c5346537c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7cffc000110801e0028003012100021101031101ffdd0004000affc401a20000010501010101010100000000000000000102030405060708090a0b100002010303020403050504040000017d01020300041105122131410613516107227114328191a1082342b1c11552d1f02433627282090a161718191a25262728292a3435363738393a434445464748494a535455565758595a636465666768696a737475767778797a838485868788898a92939495969798999aa2a3a4a5a6a7a8a9aab2b3b4b5b6b7b8b9bac2c3c4c5c6c7c8c9cad2d3d4d5d6d7d8d9dae1e2e3e4e5e6e7e8e9eaf1f2f3f4f5f6f7f8f9fa0100030101010101010101010000000000000102030405060708090a0b1100020102040403040705040400010277000102031104052131061241510761711322328108144291a1b1c109233352f0156272d10a162434e125f11718191a262728292a35363738393a434445464748494a535455565758595a636465666768696a737475767778797a82838485868788898a92939495969798999aa2a3a4a5a6a7a8a9aab2b3b4b5b6b7b8b9bac2c3c4c5c6c7c8c9cad2d3d4d5d6d7d8d9dae2e3e4e5e6e7e8e9eaf2f3f4f5f6f7f8f9faffda000c03010002110311003f00cca69ac8d06e3348569884db4845021b498a60371494008692980119a8ca7a5342101a5cd5221a0ab312ed1ee68b943e80dce2a467ffd0c806a48e592270f13b230e841a0096eeea7bb09e6c85b667033552800069c2980e14f15422418a916ad099228a95455089505584140993a2d5fb598a7cae72bd8fa536ae892e8e69e2b9d971168a459fffd1ece8a0028a006b534f4a68ce5b9130a89ab444919a61a6c634d34d21894952310d25002514084a4a00ffd2d2349564086929082929805250025140094940c4a4a04251400949408292819fffd3cca31591a098a5c62801a45464531098a69a6210d371400629a6980628eb400c64cd3791c1aa16c491479393563343105424fcc4d007ffd4c3463c0a94500381a5e3b8cd000c99e57f2a8f3835402834e0d4d08914d4aa6ac4c954d4aad4c4c955aa647a6496236ab51b552132e412e383d3f955b0722b09ab32a0c5a2a0d0ffd5ece8a0028a0061a6d5193dc8daa36ab422334c34c634")); diff --git a/test/org/traccar/protocol/MilesmateProtocolDecoderTest.java b/test/org/traccar/protocol/MilesmateProtocolDecoderTest.java index c5c749a04..be0209975 100644 --- a/test/org/traccar/protocol/MilesmateProtocolDecoderTest.java +++ b/test/org/traccar/protocol/MilesmateProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class MilesmateProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - MilesmateProtocolDecoder decoder = new MilesmateProtocolDecoder(new MilesmateProtocol()); + MilesmateProtocolDecoder decoder = new MilesmateProtocolDecoder(null); verifyPosition(decoder, text( "ApiString={A:861359037373030,B:09.8,C:00.0,D:083506,E:2838.5529N,F:07717.8049E,G:000.00,H:170918,I:G,J:00004100,K:0000000A,L:1234,M:126.86}")); diff --git a/test/org/traccar/protocol/MiniFinderProtocolDecoderTest.java b/test/org/traccar/protocol/MiniFinderProtocolDecoderTest.java index b9003a25d..e1f957c8a 100644 --- a/test/org/traccar/protocol/MiniFinderProtocolDecoderTest.java +++ b/test/org/traccar/protocol/MiniFinderProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class MiniFinderProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - MiniFinderProtocolDecoder decoder = new MiniFinderProtocolDecoder(new MiniFinderProtocol()); + MiniFinderProtocolDecoder decoder = new MiniFinderProtocolDecoder(null); verifyNull(decoder, text( "!1,867273023933661,V07S.5701.1621,100")); diff --git a/test/org/traccar/protocol/MtxProtocolDecoderTest.java b/test/org/traccar/protocol/MtxProtocolDecoderTest.java index 56def34e5..c4f15d907 100644 --- a/test/org/traccar/protocol/MtxProtocolDecoderTest.java +++ b/test/org/traccar/protocol/MtxProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class MtxProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - MtxProtocolDecoder decoder = new MtxProtocolDecoder(new MtxProtocol()); + MtxProtocolDecoder decoder = new MtxProtocolDecoder(null); verifyPosition(decoder, text( "#MTX,353815011138124,20101226,195550,41.6296399,002.3611174,000,035,000000.00,X,X,1111,000,0,0")); diff --git a/test/org/traccar/protocol/MxtProtocolDecoderTest.java b/test/org/traccar/protocol/MxtProtocolDecoderTest.java index 2b0ba6755..834a35011 100644 --- a/test/org/traccar/protocol/MxtProtocolDecoderTest.java +++ b/test/org/traccar/protocol/MxtProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class MxtProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - MxtProtocolDecoder decoder = new MxtProtocolDecoder(new MxtProtocol()); + MxtProtocolDecoder decoder = new MxtProtocolDecoder(null); verifyPosition(decoder, binary( "01a631144c7e0008643ad2f456fb2d49747cfe4cbe0ffd002008800000001021000fd43d3f1403000000ff300000f42760001031102445a81fda04")); diff --git a/test/org/traccar/protocol/NavigilProtocolDecoderTest.java b/test/org/traccar/protocol/NavigilProtocolDecoderTest.java index 5f4175352..2db4afbf2 100644 --- a/test/org/traccar/protocol/NavigilProtocolDecoderTest.java +++ b/test/org/traccar/protocol/NavigilProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class NavigilProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - NavigilProtocolDecoder decoder = new NavigilProtocolDecoder(new NavigilProtocol()); + NavigilProtocolDecoder decoder = new NavigilProtocolDecoder(null); verifyNull(decoder, binary( "01004300040020000000f60203080200e7cd0f510c0000003b00000000000000")); diff --git a/test/org/traccar/protocol/NavisProtocolDecoderTest.java b/test/org/traccar/protocol/NavisProtocolDecoderTest.java index 14a2e1ad3..d871f10ea 100644 --- a/test/org/traccar/protocol/NavisProtocolDecoderTest.java +++ b/test/org/traccar/protocol/NavisProtocolDecoderTest.java @@ -9,7 +9,7 @@ public class NavisProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - NavisProtocolDecoder decoder = new NavisProtocolDecoder(new NavisProtocol()); + NavisProtocolDecoder decoder = new NavisProtocolDecoder(null); verifyNull(decoder, binary( "404E5443010000007B000000130044342A3E533A383631373835303035323035303739")); diff --git a/test/org/traccar/protocol/NoranProtocolDecoderTest.java b/test/org/traccar/protocol/NoranProtocolDecoderTest.java index f841b7d96..7c02402b1 100644 --- a/test/org/traccar/protocol/NoranProtocolDecoderTest.java +++ b/test/org/traccar/protocol/NoranProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class NoranProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - NoranProtocolDecoder decoder = new NoranProtocolDecoder(new NoranProtocol()); + NoranProtocolDecoder decoder = new NoranProtocolDecoder(null); verifyNull(decoder, binary( "0d0a2a4b57000d000080010d0a")); diff --git a/test/org/traccar/protocol/NvsProtocolDecoderTest.java b/test/org/traccar/protocol/NvsProtocolDecoderTest.java index 70d3696eb..9a516e733 100644 --- a/test/org/traccar/protocol/NvsProtocolDecoderTest.java +++ b/test/org/traccar/protocol/NvsProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class NvsProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - NvsProtocolDecoder decoder = new NvsProtocolDecoder(new NvsProtocol()); + NvsProtocolDecoder decoder = new NvsProtocolDecoder(null); verifyNull(decoder, binary( "0012333537303430303630303137383234312e38")); diff --git a/test/org/traccar/protocol/ObdDongleProtocolDecoderTest.java b/test/org/traccar/protocol/ObdDongleProtocolDecoderTest.java index 6b7662e49..4c33d1766 100644 --- a/test/org/traccar/protocol/ObdDongleProtocolDecoderTest.java +++ b/test/org/traccar/protocol/ObdDongleProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class ObdDongleProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - ObdDongleProtocolDecoder decoder = new ObdDongleProtocolDecoder(new ObdDongleProtocol()); + ObdDongleProtocolDecoder decoder = new ObdDongleProtocolDecoder(null); verifyNull(decoder, binary( "55550003383634383637303232353131303135010009010011023402010201ABAAAA")); diff --git a/test/org/traccar/protocol/OigoProtocolDecoderTest.java b/test/org/traccar/protocol/OigoProtocolDecoderTest.java index af4720853..c79978f88 100644 --- a/test/org/traccar/protocol/OigoProtocolDecoderTest.java +++ b/test/org/traccar/protocol/OigoProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class OigoProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - OigoProtocolDecoder decoder = new OigoProtocolDecoder(new OigoProtocol()); + OigoProtocolDecoder decoder = new OigoProtocolDecoder(null); verifyPosition(decoder, binary( "7e002e000000146310002523830400001bfb000369150f310c0591594d062ac0c0141508011303cd63101604fd00000000")); diff --git a/test/org/traccar/protocol/OkoProtocolDecoderTest.java b/test/org/traccar/protocol/OkoProtocolDecoderTest.java index 7e913ca2b..e2f72c161 100644 --- a/test/org/traccar/protocol/OkoProtocolDecoderTest.java +++ b/test/org/traccar/protocol/OkoProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class OkoProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - OkoProtocolDecoder decoder = new OkoProtocolDecoder(new OkoProtocol()); + OkoProtocolDecoder decoder = new OkoProtocolDecoder(null); verifyPosition(decoder, text( "{861694033681089,045403.00,A,4924.14181,N,03207.43787,E,0.080,,151117,07,0.00,01,24.8,1,02,5n4}")); diff --git a/test/org/traccar/protocol/OpenGtsProtocolDecoderTest.java b/test/org/traccar/protocol/OpenGtsProtocolDecoderTest.java index cc7d5b684..a04cf4e72 100644 --- a/test/org/traccar/protocol/OpenGtsProtocolDecoderTest.java +++ b/test/org/traccar/protocol/OpenGtsProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class OpenGtsProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - OpenGtsProtocolDecoder decoder = new OpenGtsProtocolDecoder(new OpenGtsProtocol()); + OpenGtsProtocolDecoder decoder = new OpenGtsProtocolDecoder(null); verifyPosition(decoder, request( "/?id=999000000000003&gprmc=$GPRMC,082202.0,A,5006.747329,N,01416.512315,E,0.0,,131018,1.2,E,A*2E")); diff --git a/test/org/traccar/protocol/OrionProtocolDecoderTest.java b/test/org/traccar/protocol/OrionProtocolDecoderTest.java index 8568ab6ce..bb5f1f135 100644 --- a/test/org/traccar/protocol/OrionProtocolDecoderTest.java +++ b/test/org/traccar/protocol/OrionProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class OrionProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - OrionProtocolDecoder decoder = new OrionProtocolDecoder(new OrionProtocol()); + OrionProtocolDecoder decoder = new OrionProtocolDecoder(null); verifyPositions(decoder, binary( "5057000137bf6236235a0331b5c6e402a3b5ecff5102980003000e0c1d172936080e0c1d172936b03b01000882050000008e080000000000008c0300940500000084030085030003067600900113150000000000000000000000000000000000000004a4c8")); diff --git a/test/org/traccar/protocol/OsmAndProtocolDecoderTest.java b/test/org/traccar/protocol/OsmAndProtocolDecoderTest.java index da7aef6ea..3c38bd831 100644 --- a/test/org/traccar/protocol/OsmAndProtocolDecoderTest.java +++ b/test/org/traccar/protocol/OsmAndProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class OsmAndProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - OsmAndProtocolDecoder decoder = new OsmAndProtocolDecoder(new OsmAndProtocol()); + OsmAndProtocolDecoder decoder = new OsmAndProtocolDecoder(null); verifyNotNull(decoder, request( "/?id=123456×tamp=1377177267&cell=257,02,16,2224&cell=257,02,16,2223,-90&wifi=00-14-22-01-23-45,-80&wifi=00-1C-B3-09-85-15,-70")); diff --git a/test/org/traccar/protocol/OwnTracksProtocolDecoderTest.java b/test/org/traccar/protocol/OwnTracksProtocolDecoderTest.java index 341662255..553e7eb16 100644 --- a/test/org/traccar/protocol/OwnTracksProtocolDecoderTest.java +++ b/test/org/traccar/protocol/OwnTracksProtocolDecoderTest.java @@ -9,7 +9,7 @@ public class OwnTracksProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - OwnTracksProtocolDecoder decoder = new OwnTracksProtocolDecoder(new OwnTracksProtocol()); + OwnTracksProtocolDecoder decoder = new OwnTracksProtocolDecoder(null); verifyPosition(decoder, request(HttpMethod.POST, "/", buffer("{\"lon\":2.29513,\"lat\":48.85833,\"tst\":1497349316,\"_type\":\"location\",\"tid\":\"JJ\"}"))); diff --git a/test/org/traccar/protocol/PathAwayProtocolDecoderTest.java b/test/org/traccar/protocol/PathAwayProtocolDecoderTest.java index 5515ca135..4b9739242 100644 --- a/test/org/traccar/protocol/PathAwayProtocolDecoderTest.java +++ b/test/org/traccar/protocol/PathAwayProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class PathAwayProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - PathAwayProtocolDecoder decoder = new PathAwayProtocolDecoder(new PathAwayProtocol()); + PathAwayProtocolDecoder decoder = new PathAwayProtocolDecoder(null); verifyPosition(decoder, request( "?UserName=name&Password=pass&LOC=$PWS,1,\"Roger\",,,100107,122846,45.317270,-79.642219,45.00,42,1,\"Comment\",0*58")); diff --git a/test/org/traccar/protocol/PiligrimProtocolDecoderTest.java b/test/org/traccar/protocol/PiligrimProtocolDecoderTest.java index 9833ea519..03d0dd7b9 100644 --- a/test/org/traccar/protocol/PiligrimProtocolDecoderTest.java +++ b/test/org/traccar/protocol/PiligrimProtocolDecoderTest.java @@ -9,7 +9,7 @@ public class PiligrimProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - PiligrimProtocolDecoder decoder = new PiligrimProtocolDecoder(new PiligrimProtocol()); + PiligrimProtocolDecoder decoder = new PiligrimProtocolDecoder(null); verifyPositions(decoder, request(HttpMethod.POST, "/bingps?imei=868204005544720&csq=18&vout=00&vin=4050&dataid=00000000", diff --git a/test/org/traccar/protocol/PretraceProtocolDecoderTest.java b/test/org/traccar/protocol/PretraceProtocolDecoderTest.java index 573b6b888..61a057dd7 100644 --- a/test/org/traccar/protocol/PretraceProtocolDecoderTest.java +++ b/test/org/traccar/protocol/PretraceProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class PretraceProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - PretraceProtocolDecoder decoder = new PretraceProtocolDecoder(new PretraceProtocol()); + PretraceProtocolDecoder decoder = new PretraceProtocolDecoder(null); verifyPosition(decoder, text( "(867967021915915U1110A1701201500102238.1700N11401.9324E000264000000000009001790000000,&P11A4,F1050^47")); diff --git a/test/org/traccar/protocol/PricolProtocolDecoderTest.java b/test/org/traccar/protocol/PricolProtocolDecoderTest.java index 0c792a8ec..dbc1665fb 100644 --- a/test/org/traccar/protocol/PricolProtocolDecoderTest.java +++ b/test/org/traccar/protocol/PricolProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class PricolProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - PricolProtocolDecoder decoder = new PricolProtocolDecoder(new PricolProtocol()); + PricolProtocolDecoder decoder = new PricolProtocolDecoder(null); verifyPosition(decoder, binary( "3c5052493030303350020000011402110b222b0455152e4e001de819ca450000000000000003820249000000000000000000000000000000000000000040003e")); diff --git a/test/org/traccar/protocol/ProgressProtocolDecoderTest.java b/test/org/traccar/protocol/ProgressProtocolDecoderTest.java index 04d00d150..5f6f564b1 100644 --- a/test/org/traccar/protocol/ProgressProtocolDecoderTest.java +++ b/test/org/traccar/protocol/ProgressProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class ProgressProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - ProgressProtocolDecoder decoder = new ProgressProtocolDecoder(new ProgressProtocol()); + ProgressProtocolDecoder decoder = new ProgressProtocolDecoder(null); verifyNull(decoder, binary( "020037000100000003003131310f003335343836383035313339303036320f00323530303136333832383531353535010000000100000000000000e6bb97b6")); diff --git a/test/org/traccar/protocol/Pt3000ProtocolDecoderTest.java b/test/org/traccar/protocol/Pt3000ProtocolDecoderTest.java index 664c986af..e7d87d583 100644 --- a/test/org/traccar/protocol/Pt3000ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Pt3000ProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class Pt3000ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Pt3000ProtocolDecoder decoder = new Pt3000ProtocolDecoder(new Pt3000Protocol()); + Pt3000ProtocolDecoder decoder = new Pt3000ProtocolDecoder(null); verifyPosition(decoder, text( "%356939010012099,$GPRMC,124945.752,A,4436.6245,N,01054.4634,E,0.11,358.52,060408,,,A,+393334347445,N028d"), diff --git a/test/org/traccar/protocol/Pt502ProtocolDecoderTest.java b/test/org/traccar/protocol/Pt502ProtocolDecoderTest.java index cca264faa..cb1c1eb0e 100644 --- a/test/org/traccar/protocol/Pt502ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Pt502ProtocolDecoderTest.java @@ -9,7 +9,7 @@ public class Pt502ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Pt502ProtocolDecoder decoder = new Pt502ProtocolDecoder(new Pt502Protocol()); + Pt502ProtocolDecoder decoder = new Pt502ProtocolDecoder(null); verifyNull(decoder, binary( "24504844302c3936302cffd8ffdb008400140e0f120f0d14121012171514181e32211e1c1c1e3d2c2e243249404c4b47404645505a736250556d5645466488656d777b8182814e608d978c7d96737e817c011517171e1a1e3b21213b7c5346537c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7c7cffc000110800f0014003012100021101031101ffdd0004000affc401a20000010501010101010100000000000000000102030405060708090a0b100002010303020403050504040000017d01020300041105122131410613516107227114328191a1082342b1c11552d1f02433627282090a161718191a25262728292a3435363738393a434445464748494a535455565758595a636465666768696a737475767778797a838485868788898a92939495969798999aa2a3a4a5a6a7a8a9aab2b3b4b5b6b7b8b9bac2c3c4c5c6c7c8c9cad2d3d4d5d6d7d8d9dae1e2e3e4e5e6e7e8e9eaf1f2f3f4f5f6f7f8f9fa0100030101010101010101010000000000000102030405060708090a0b1100020102040403040705040400010277000102031104052131061241510761711322328108144291a1b1c109233352f0156272d10a162434e125f11718191a262728292a35363738393a434445464748494a535455565758595a636465666768696a737475767778797a82838485868788898a92939495969798999aa2a3a4a5a6a7a8a9aab2b3b4b5b6b7b8b9bac2c3c4c5c6c7c8c9cad2d3d4d5d6d7d8d9dae2e3e4e5e6e7e8e9eaf2f3f4f5f6f7f8f9faffda000c03010002110311003f00e5292800ef450020a2800a2801d49400b450014b40052e2800a69340094a05007fffd0e5d14b10055b51b00c76a00527273494005250014500251400525001450015347c25003a928010d25007ffd1e52909a00290d0014b40052d0014500145002e297b50018a280109a6d002d2e2803fffd2e7a04da3777a94fbd0025140052500145002514005250014940054e381400b494008690d007fffd3e4f345001486800a5a005a2800a2801680280168a002909e280100cd028016a48937bfb5007fffd4c5038a42280128a004a280128a003ad2500251400945002a8cb0a9a80133450026692803ffd5e4e8a004a2801694500145002d18a005c5140052e280109a69a0029680140abb147b139eb401ffd6c62290d00251400949400114940052500252d002525003e31c93525002521a004a4a00ffd7e4a8a00281400a29d40094b40053ba500252d0018a31400d3cd250018cd2d005ab58777ccdd074ab645007ffd0c72290d00348a2801280")); diff --git a/test/org/traccar/protocol/Pt60ProtocolDecoderTest.java b/test/org/traccar/protocol/Pt60ProtocolDecoderTest.java index 69d77fe66..f150c61a6 100644 --- a/test/org/traccar/protocol/Pt60ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Pt60ProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class Pt60ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Pt60ProtocolDecoder decoder = new Pt60ProtocolDecoder(new Pt60Protocol()); + Pt60ProtocolDecoder decoder = new Pt60ProtocolDecoder(null); verifyAttributes(decoder, text( "@G#@,V01,14,357653051059785,9404223001501310,20180419165604,101,26,")); diff --git a/test/org/traccar/protocol/RaveonProtocolDecoderTest.java b/test/org/traccar/protocol/RaveonProtocolDecoderTest.java index fdaf0939d..165027351 100644 --- a/test/org/traccar/protocol/RaveonProtocolDecoderTest.java +++ b/test/org/traccar/protocol/RaveonProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class RaveonProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - RaveonProtocolDecoder decoder = new RaveonProtocolDecoder(new RaveonProtocol()); + RaveonProtocolDecoder decoder = new RaveonProtocolDecoder(null); verifyPosition(decoder, text( "$PRAVE,0001,0001,3308.9051,-11713.1164,195348,1,10,168,31,13.3,3,-83,0,0,,1003.4*66")); diff --git a/test/org/traccar/protocol/RecodaProtocolDecoderTest.java b/test/org/traccar/protocol/RecodaProtocolDecoderTest.java index dc38935fc..668879787 100644 --- a/test/org/traccar/protocol/RecodaProtocolDecoderTest.java +++ b/test/org/traccar/protocol/RecodaProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class RecodaProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - RecodaProtocolDecoder decoder = new RecodaProtocolDecoder(new RecodaProtocol()); + RecodaProtocolDecoder decoder = new RecodaProtocolDecoder(null); verifyNull(decoder, binary( "01100020480000000300000030393535360000000000000001000000303030303000000000000000000000000000000000000000006100004531313037353500ffffffffffff0000")); diff --git a/test/org/traccar/protocol/RetranslatorProtocolDecoderTest.java b/test/org/traccar/protocol/RetranslatorProtocolDecoderTest.java index 680570763..779e21823 100644 --- a/test/org/traccar/protocol/RetranslatorProtocolDecoderTest.java +++ b/test/org/traccar/protocol/RetranslatorProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class RetranslatorProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - RetranslatorProtocolDecoder decoder = new RetranslatorProtocolDecoder(new RetranslatorProtocol()); + RetranslatorProtocolDecoder decoder = new RetranslatorProtocolDecoder(null); verifyPosition(decoder, binary( "74000000333533393736303133343435343835004B0BFB70000000030BBB000000270102706F73696E666F00A027AFDF5D9848403AC7253383DD4B400000000000805A40003601460B0BBB0000001200047077725F657874002B8716D9CE973B400BBB00000011010361766C5F696E707574730000000001")); diff --git a/test/org/traccar/protocol/RitiProtocolDecoderTest.java b/test/org/traccar/protocol/RitiProtocolDecoderTest.java index 5a3967348..73d07efd6 100644 --- a/test/org/traccar/protocol/RitiProtocolDecoderTest.java +++ b/test/org/traccar/protocol/RitiProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class RitiProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - RitiProtocolDecoder decoder = new RitiProtocolDecoder(new RitiProtocol()); + RitiProtocolDecoder decoder = new RitiProtocolDecoder(null); verifyPosition(decoder, binary( "3b28a2a2056315316d4000008100000000000000005f710000244750524d432c3138303535332e3030302c412c353532342e383437312c4e2c30313133342e313837382c452c302e30302c2c3032313231332c2c2c412a37340d0a00000000000000000000000000000000040404")); diff --git a/test/org/traccar/protocol/RoboTrackProtocolDecoderTest.java b/test/org/traccar/protocol/RoboTrackProtocolDecoderTest.java index b68379098..0c969ab68 100644 --- a/test/org/traccar/protocol/RoboTrackProtocolDecoderTest.java +++ b/test/org/traccar/protocol/RoboTrackProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class RoboTrackProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - RoboTrackProtocolDecoder decoder = new RoboTrackProtocolDecoder(new RoboTrackProtocol()); + RoboTrackProtocolDecoder decoder = new RoboTrackProtocolDecoder(null); verifyNull(decoder, binary( "00524f424f545241434b00000000000000383638323034303032323533343136313233343536373839303132312e313261000000312e353761000000312e3030000000003e")); diff --git a/test/org/traccar/protocol/RuptelaProtocolDecoderTest.java b/test/org/traccar/protocol/RuptelaProtocolDecoderTest.java index 3632ef511..12f63ef7d 100644 --- a/test/org/traccar/protocol/RuptelaProtocolDecoderTest.java +++ b/test/org/traccar/protocol/RuptelaProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class RuptelaProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - RuptelaProtocolDecoder decoder = new RuptelaProtocolDecoder(new RuptelaProtocol()); + RuptelaProtocolDecoder decoder = new RuptelaProtocolDecoder(null); verifyNull(decoder, binary( "002e000315bc70d3e2ff0f4f42443130302e30312e30382e30300000c2b30ea77e430000601b000001f40000003c00144aa0")); diff --git a/test/org/traccar/protocol/SabertekProtocolDecoderTest.java b/test/org/traccar/protocol/SabertekProtocolDecoderTest.java index 32309fe12..20b02841e 100644 --- a/test/org/traccar/protocol/SabertekProtocolDecoderTest.java +++ b/test/org/traccar/protocol/SabertekProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class SabertekProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - SabertekProtocolDecoder decoder = new SabertekProtocolDecoder(new SabertekProtocol()); + SabertekProtocolDecoder decoder = new SabertekProtocolDecoder(null); verifyPosition(decoder, text( ",999999999,3,40,65,7,0,1,-25.781666,28.254702,40,268,1414,8,55623,")); diff --git a/test/org/traccar/protocol/SanavProtocolDecoderTest.java b/test/org/traccar/protocol/SanavProtocolDecoderTest.java index 3dea71e93..36fd7ecba 100644 --- a/test/org/traccar/protocol/SanavProtocolDecoderTest.java +++ b/test/org/traccar/protocol/SanavProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class SanavProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - SanavProtocolDecoder decoder = new SanavProtocolDecoder(new SanavProtocol()); + SanavProtocolDecoder decoder = new SanavProtocolDecoder(null); verifyPosition(decoder, text( "imei=353197040023431&rmc=$GPRMC,015258.000,A,2457.8101,N,12125.5393,E,0.00,0.00,210111,,*18,AUTO,0300,2.1,10,466,97,34E7,3391,74,466,9 7,3F2D,3391,65,466,97,39C9,3391,79,466,97,3F2C,3391,81,466,97,0000,00 00,83,466,97,0000,0000,85,466,97,0000,0000,85,1,24")); diff --git a/test/org/traccar/protocol/SigfoxProtocolDecoderTest.java b/test/org/traccar/protocol/SigfoxProtocolDecoderTest.java index 24c60abe7..48adb0ccb 100644 --- a/test/org/traccar/protocol/SigfoxProtocolDecoderTest.java +++ b/test/org/traccar/protocol/SigfoxProtocolDecoderTest.java @@ -9,7 +9,7 @@ public class SigfoxProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - SigfoxProtocolDecoder decoder = new SigfoxProtocolDecoder(new SigfoxProtocol()); + SigfoxProtocolDecoder decoder = new SigfoxProtocolDecoder(null); verifyPosition(decoder, request(HttpMethod.POST, "/", buffer("%7B++%22device%22%3A%222BF839%22%2C++%22time%22%3A1510605882%2C++%22duplicate%22%3Afalse%2C++%22snr%22%3A45.61%2C++%22station%22%3A%2235A9%22%2C++%22data%22%3A%2200bd6475e907398e562d01b9%22%2C++%22avgSnr%22%3A45.16%2C++%22lat%22%3A-38.0%2C++%22lng%22%3A145.0%2C++%22rssi%22%3A-98.00%2C++%22seqNumber%22%3A228+%7D="))); diff --git a/test/org/traccar/protocol/SiwiProtocolDecoderTest.java b/test/org/traccar/protocol/SiwiProtocolDecoderTest.java index 19d1552b2..3a91d8482 100644 --- a/test/org/traccar/protocol/SiwiProtocolDecoderTest.java +++ b/test/org/traccar/protocol/SiwiProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class SiwiProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - SiwiProtocolDecoder decoder = new SiwiProtocolDecoder(new SiwiProtocol()); + SiwiProtocolDecoder decoder = new SiwiProtocolDecoder(null); verifyPosition(decoder, text( "$SIWI,9803932,23992,E,0,,0,1,1,0,5055,0,5,A,22.289887,70.807192,152,168,102922,090317,28,1,12,5,4098,1,0,13,0,0,0,1.0,3.1CHKS_4.82,0!")); diff --git a/test/org/traccar/protocol/SkypatrolProtocolDecoderTest.java b/test/org/traccar/protocol/SkypatrolProtocolDecoderTest.java index f87d4898f..bc2dac7e9 100644 --- a/test/org/traccar/protocol/SkypatrolProtocolDecoderTest.java +++ b/test/org/traccar/protocol/SkypatrolProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class SkypatrolProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - SkypatrolProtocolDecoder decoder = new SkypatrolProtocolDecoder(new SkypatrolProtocol()); + SkypatrolProtocolDecoder decoder = new SkypatrolProtocolDecoder(null); verifyNull(decoder, binary( "000a02171101303131373232303031333537393833060200000006202020202020202020312020202020202030313137323230303133353739383320")); diff --git a/test/org/traccar/protocol/SmartSoleProtocolDecoderTest.java b/test/org/traccar/protocol/SmartSoleProtocolDecoderTest.java index 63600c7a2..183af899b 100644 --- a/test/org/traccar/protocol/SmartSoleProtocolDecoderTest.java +++ b/test/org/traccar/protocol/SmartSoleProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class SmartSoleProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - SmartSoleProtocolDecoder decoder = new SmartSoleProtocolDecoder(new SmartSoleProtocol()); + SmartSoleProtocolDecoder decoder = new SmartSoleProtocolDecoder(null); verifyPosition(decoder, text( "#GTXRP=359366080000385,8,180514200051,34.041981,-118.255806,60,1,1,7,1.80,180514200051,4.16,11")); diff --git a/test/org/traccar/protocol/SmokeyProtocolDecoderTest.java b/test/org/traccar/protocol/SmokeyProtocolDecoderTest.java index d3e268992..c2d74b433 100644 --- a/test/org/traccar/protocol/SmokeyProtocolDecoderTest.java +++ b/test/org/traccar/protocol/SmokeyProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class SmokeyProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - SmokeyProtocolDecoder decoder = new SmokeyProtocolDecoder(new SmokeyProtocol()); + SmokeyProtocolDecoder decoder = new SmokeyProtocolDecoder(null); verifyAttributes(decoder, binary( "534d0300865101019383025f0403000000000b86250200000c0000028f000102f8cc0900127f08")); diff --git a/test/org/traccar/protocol/SpotProtocolDecoderTest.java b/test/org/traccar/protocol/SpotProtocolDecoderTest.java index d893fa0e2..7191f31ef 100644 --- a/test/org/traccar/protocol/SpotProtocolDecoderTest.java +++ b/test/org/traccar/protocol/SpotProtocolDecoderTest.java @@ -9,7 +9,7 @@ public class SpotProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - SpotProtocolDecoder decoder = new SpotProtocolDecoder(new SpotProtocol()); + SpotProtocolDecoder decoder = new SpotProtocolDecoder(null); verifyPositions(decoder, request(HttpMethod.POST, "/", buffer("\n\n
\n 1\n LIVE\n
\n \n 891801957\n 0-3112123\n 0-3112123a\n NEWMOVEMENT\n SPOT Trace has detected that the asset has moved.\n 2017-12-27T13:19:38.000Z\n 1514380778\n -1.28781\n -47.93042\n GOOD\n \n"))); diff --git a/test/org/traccar/protocol/StarLinkProtocolDecoderTest.java b/test/org/traccar/protocol/StarLinkProtocolDecoderTest.java index ab50e84ca..70e173284 100644 --- a/test/org/traccar/protocol/StarLinkProtocolDecoderTest.java +++ b/test/org/traccar/protocol/StarLinkProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class StarLinkProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - StarLinkProtocolDecoder decoder = new StarLinkProtocolDecoder(new StarLinkProtocol()); + StarLinkProtocolDecoder decoder = new StarLinkProtocolDecoder(null); verifyAttributes(decoder, text( "$SLU068328,06,55,170518122023,16,,,,,,000000,1,1,0,0,0,0,0,0,10443,32722,12.664,03.910,,0,0,,01000001FDB3A9*BF")); diff --git a/test/org/traccar/protocol/Stl060ProtocolDecoderTest.java b/test/org/traccar/protocol/Stl060ProtocolDecoderTest.java index e2fd2a075..e2be2028e 100644 --- a/test/org/traccar/protocol/Stl060ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Stl060ProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class Stl060ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Stl060ProtocolDecoder decoder = new Stl060ProtocolDecoder(new Stl060Protocol()); + Stl060ProtocolDecoder decoder = new Stl060ProtocolDecoder(null); verifyPosition(decoder, text( "$1,357804048043099,D001,AP29AW0963,23/02/14,14:06:54,17248488N,078342226E,0.08,193.12,1,1,1,1,1,A"), diff --git a/test/org/traccar/protocol/SuntechProtocolDecoderTest.java b/test/org/traccar/protocol/SuntechProtocolDecoderTest.java index 3b907e080..7e4de91d6 100644 --- a/test/org/traccar/protocol/SuntechProtocolDecoderTest.java +++ b/test/org/traccar/protocol/SuntechProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class SuntechProtocolDecoderTest extends ProtocolTest { @Test public void testDecodeTemperature() throws Exception { - SuntechProtocolDecoder decoder = new SuntechProtocolDecoder(new SuntechProtocol()); + SuntechProtocolDecoder decoder = new SuntechProtocolDecoder(null); decoder.setHbm(true); decoder.setIncludeAdc(true); @@ -25,7 +25,7 @@ public class SuntechProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - SuntechProtocolDecoder decoder = new SuntechProtocolDecoder(new SuntechProtocol()); + SuntechProtocolDecoder decoder = new SuntechProtocolDecoder(null); verifyPosition(decoder, text( "ST410STT;007272376;408;01;21651;732;123;-65;1824;1;21654;732;123;1824;0;0;22542;732;123;1824;0;0;21656;732;123;1824;0;0;21655;732;123;1824;0;0;22541;732;123;1824;0;0;0;0;0;0;0;0;3.7;1;0156;1;20180816;05:18:52;+04.722322;-074.052776;000.074;000.00;10;1")); diff --git a/test/org/traccar/protocol/SupermateProtocolDecoderTest.java b/test/org/traccar/protocol/SupermateProtocolDecoderTest.java index dac660182..2a7ab2dee 100755 --- a/test/org/traccar/protocol/SupermateProtocolDecoderTest.java +++ b/test/org/traccar/protocol/SupermateProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class SupermateProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - SupermateProtocolDecoder decoder = new SupermateProtocolDecoder(new SupermateProtocol()); + SupermateProtocolDecoder decoder = new SupermateProtocolDecoder(null); verifyPosition(decoder, text( "2:359672050130411:1:*,00000000,XT,A,10031b,140b28,80ad4c72,81ba2d2c,06ab,238c,020204010000,12,0,0000,0003e6")); diff --git a/test/org/traccar/protocol/SviasProtocolDecoderTest.java b/test/org/traccar/protocol/SviasProtocolDecoderTest.java index 3bf355a15..f7b15ca2e 100644 --- a/test/org/traccar/protocol/SviasProtocolDecoderTest.java +++ b/test/org/traccar/protocol/SviasProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class SviasProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - SviasProtocolDecoder decoder = new SviasProtocolDecoder(new SviasProtocol()); + SviasProtocolDecoder decoder = new SviasProtocolDecoder(null); verifyPosition(decoder, text( "[7061,3041,57,20324277,710,40618,141342,-93155840,-371754060,0,20469,0,16,1,0,0,11323,100,9,,32,4695")); diff --git a/test/org/traccar/protocol/T55ProtocolDecoderTest.java b/test/org/traccar/protocol/T55ProtocolDecoderTest.java index 298540e3b..6b286b485 100644 --- a/test/org/traccar/protocol/T55ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/T55ProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class T55ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - T55ProtocolDecoder decoder = new T55ProtocolDecoder(new T55Protocol()); + T55ProtocolDecoder decoder = new T55ProtocolDecoder(null); verifyNull(decoder, text( "$IMEI=355797031609284")); @@ -107,7 +107,7 @@ public class T55ProtocolDecoderTest extends ProtocolTest { // Maxon devices can send NMEA before identification - T55ProtocolDecoder decoder = new T55ProtocolDecoder(new T55Protocol()); + T55ProtocolDecoder decoder = new T55ProtocolDecoder(null); verifyNull(decoder, text( "$GPRMC,012006,A,4828.10,N,1353.52,E,0.00,0.00,180915,020.3,E*42")); diff --git a/test/org/traccar/protocol/T57ProtocolDecoderTest.java b/test/org/traccar/protocol/T57ProtocolDecoderTest.java index 1100ef17d..c457b4602 100644 --- a/test/org/traccar/protocol/T57ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/T57ProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class T57ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - T57ProtocolDecoder decoder = new T57ProtocolDecoder(new T57Protocol()); + T57ProtocolDecoder decoder = new T57ProtocolDecoder(null); verifyPosition(decoder, text( "*T57#F1#T571117001#301117#000843#2234.1303#N#08826.1714#E#+0.242,+0.109,-0.789#0.000#6.20000#A2#4.2#")); diff --git a/test/org/traccar/protocol/T800xProtocolDecoderTest.java b/test/org/traccar/protocol/T800xProtocolDecoderTest.java index fb8800a5c..aa74ec417 100644 --- a/test/org/traccar/protocol/T800xProtocolDecoderTest.java +++ b/test/org/traccar/protocol/T800xProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class T800xProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - T800xProtocolDecoder decoder = new T800xProtocolDecoder(new T800xProtocol()); + T800xProtocolDecoder decoder = new T800xProtocolDecoder(null); verifyNull(decoder, binary( "252501001504050880061689888888111111250350")); diff --git a/test/org/traccar/protocol/TaipProtocolDecoderTest.java b/test/org/traccar/protocol/TaipProtocolDecoderTest.java index 264724ce9..bdbaec8aa 100644 --- a/test/org/traccar/protocol/TaipProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TaipProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class TaipProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - TaipProtocolDecoder decoder = new TaipProtocolDecoder(new TaipProtocol()); + TaipProtocolDecoder decoder = new TaipProtocolDecoder(null); verifyPosition(decoder, text( ">RGP211217112154-2748332-058946350000000FF7F2100;ID=AA01;#0002;*2D<")); diff --git a/test/org/traccar/protocol/TekProtocolDecoderTest.java b/test/org/traccar/protocol/TekProtocolDecoderTest.java index 64bcf1285..f67ae9c3f 100644 --- a/test/org/traccar/protocol/TekProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TekProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class TekProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - TekProtocolDecoder decoder = new TekProtocolDecoder(new TekProtocol()); + TekProtocolDecoder decoder = new TekProtocolDecoder(null); verifyPosition(decoder, binary( "0501E304E00E76086107502100455111492C33332C3137303935342E302C353235352E393933344E2C30303833322E34333935572C322E312C3133342E382C322C302E30302C302E302C302E302C3234303931352C30362C3C45")); diff --git a/test/org/traccar/protocol/TelemaxProtocolDecoderTest.java b/test/org/traccar/protocol/TelemaxProtocolDecoderTest.java index 2a26386d7..e330600e5 100644 --- a/test/org/traccar/protocol/TelemaxProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TelemaxProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class TelemaxProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - TelemaxProtocolDecoder decoder = new TelemaxProtocolDecoder(new TelemaxProtocol()); + TelemaxProtocolDecoder decoder = new TelemaxProtocolDecoder(null); verifyNull(decoder, text( "%067374070128")); diff --git a/test/org/traccar/protocol/TelicProtocolDecoderTest.java b/test/org/traccar/protocol/TelicProtocolDecoderTest.java index ed8245e1f..b743cef96 100644 --- a/test/org/traccar/protocol/TelicProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TelicProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class TelicProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - TelicProtocolDecoder decoder = new TelicProtocolDecoder(new TelicProtocol()); + TelicProtocolDecoder decoder = new TelicProtocolDecoder(null); verifyNull(decoder, text( "0026355565071347499|206|01|001002008")); diff --git a/test/org/traccar/protocol/ThinkRaceProtocolDecoderTest.java b/test/org/traccar/protocol/ThinkRaceProtocolDecoderTest.java index cf8eb12aa..a30d17502 100644 --- a/test/org/traccar/protocol/ThinkRaceProtocolDecoderTest.java +++ b/test/org/traccar/protocol/ThinkRaceProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class ThinkRaceProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - ThinkRaceProtocolDecoder decoder = new ThinkRaceProtocolDecoder(new ThinkRaceProtocol()); + ThinkRaceProtocolDecoder decoder = new ThinkRaceProtocolDecoder(null); verifyNull(decoder, binary( "48415349483031343730303134382C8000100134363030303134363139363239343806FF")); diff --git a/test/org/traccar/protocol/Tk102ProtocolDecoderTest.java b/test/org/traccar/protocol/Tk102ProtocolDecoderTest.java index 66946007a..f1ba7c593 100644 --- a/test/org/traccar/protocol/Tk102ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Tk102ProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class Tk102ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Tk102ProtocolDecoder decoder = new Tk102ProtocolDecoder(new Tk102Protocol()); + Tk102ProtocolDecoder decoder = new Tk102ProtocolDecoder(null); verifyNull(decoder, buffer( "[\u00800000000000\u000821315452]")); diff --git a/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java b/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java index 699c702c9..d59301104 100644 --- a/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java @@ -9,7 +9,7 @@ public class Tk103ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Tk103ProtocolDecoder decoder = new Tk103ProtocolDecoder(new Tk103Protocol()); + Tk103ProtocolDecoder decoder = new Tk103ProtocolDecoder(null); verifyPosition(decoder, text( "(019358704260BR00180725A2300.0957N07235.2748E032.412092187.58001100166L000D9779)")); diff --git a/test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java b/test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java index c612c1d25..b9a41314a 100644 --- a/test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class Tlt2hProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Tlt2hProtocolDecoder decoder = new Tlt2hProtocolDecoder(new Tlt2hProtocol()); + Tlt2hProtocolDecoder decoder = new Tlt2hProtocolDecoder(null); verifyPositions(decoder, text( "#868323028789359#MT600#0000#AUTOLOW#1\r\n", diff --git a/test/org/traccar/protocol/TlvProtocolDecoderTest.java b/test/org/traccar/protocol/TlvProtocolDecoderTest.java index 6c37c4dbb..0aaf567e8 100644 --- a/test/org/traccar/protocol/TlvProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TlvProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class TlvProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - TlvProtocolDecoder decoder = new TlvProtocolDecoder(new TlvProtocol()); + TlvProtocolDecoder decoder = new TlvProtocolDecoder(null); verifyNull(decoder, binary( "30430f383630323437303330303934333931ff10393233323132323030303834353433340f533636385f415f56312e30315f454eff1130303a30433a45373a30303a30303a30300132")); diff --git a/test/org/traccar/protocol/TmgProtocolDecoderTest.java b/test/org/traccar/protocol/TmgProtocolDecoderTest.java index fd027eddf..5df2378d9 100644 --- a/test/org/traccar/protocol/TmgProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TmgProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class TmgProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - TmgProtocolDecoder decoder = new TmgProtocolDecoder(new TmgProtocol()); + TmgProtocolDecoder decoder = new TmgProtocolDecoder(null); verifyPosition(decoder, text( "$loc,869309013800417,08032014,094459,1,2826.1956,N,07659.7690,E,0.0,2.5,4441,31,6,95,1,LLLL,NNTN,HH,0.15,0.26,HR38AU1389,0,SW0.1a")); diff --git a/test/org/traccar/protocol/TopflytechProtocolDecoderTest.java b/test/org/traccar/protocol/TopflytechProtocolDecoderTest.java index 3e0f4e562..666a48bfa 100644 --- a/test/org/traccar/protocol/TopflytechProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TopflytechProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class TopflytechProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - TopflytechProtocolDecoder decoder = new TopflytechProtocolDecoder(new TopflytechProtocol()); + TopflytechProtocolDecoder decoder = new TopflytechProtocolDecoder(null); verifyPosition(decoder, text( "(880316890094910BP00XG00b600000000L00074b54S00000000R0C0F0014000100f0130531152205A0706.1395S11024.0965E000.0251.25")); diff --git a/test/org/traccar/protocol/TotemProtocolDecoderTest.java b/test/org/traccar/protocol/TotemProtocolDecoderTest.java index ae0a240b8..c9990acdf 100644 --- a/test/org/traccar/protocol/TotemProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TotemProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class TotemProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - TotemProtocolDecoder decoder = new TotemProtocolDecoder(new TotemProtocol()); + TotemProtocolDecoder decoder = new TotemProtocolDecoder(null); verifyPosition(decoder, text( "$$011602867119025755430|50099800180420045019401400000000000000B8797D110816811201.500002132615.7037S02801.8099E056149")); diff --git a/test/org/traccar/protocol/Tr20ProtocolDecoderTest.java b/test/org/traccar/protocol/Tr20ProtocolDecoderTest.java index 89dd7a6e3..c00c5f069 100644 --- a/test/org/traccar/protocol/Tr20ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Tr20ProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class Tr20ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Tr20ProtocolDecoder decoder = new Tr20ProtocolDecoder(new Tr20Protocol()); + Tr20ProtocolDecoder decoder = new Tr20ProtocolDecoder(null); verifyNull(decoder, text( "%%TRACKPRO01,1")); diff --git a/test/org/traccar/protocol/Tr900ProtocolDecoderTest.java b/test/org/traccar/protocol/Tr900ProtocolDecoderTest.java index 326583178..92fe0da29 100644 --- a/test/org/traccar/protocol/Tr900ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Tr900ProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class Tr900ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Tr900ProtocolDecoder decoder = new Tr900ProtocolDecoder(new Tr900Protocol()); + Tr900ProtocolDecoder decoder = new Tr900ProtocolDecoder(null); verifyPosition(decoder, text( ">00001001,4,1,150626,131252,W05830.2978,S3137.2783,,00,348,18,00,003-000,0,3,11111011*3b!"), diff --git a/test/org/traccar/protocol/TrackboxProtocolDecoderTest.java b/test/org/traccar/protocol/TrackboxProtocolDecoderTest.java index 45feb4bf2..e83824fb4 100644 --- a/test/org/traccar/protocol/TrackboxProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TrackboxProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class TrackboxProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - TrackboxProtocolDecoder decoder = new TrackboxProtocolDecoder(new TrackboxProtocol()); + TrackboxProtocolDecoder decoder = new TrackboxProtocolDecoder(null); verifyNull(decoder, text( "a=connect&v=11&i=111111111111111")); diff --git a/test/org/traccar/protocol/TrakMateProtocolDecoderTest.java b/test/org/traccar/protocol/TrakMateProtocolDecoderTest.java index b08decc92..acfac6f4b 100644 --- a/test/org/traccar/protocol/TrakMateProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TrakMateProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class TrakMateProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - TrakMateProtocolDecoder decoder = new TrakMateProtocolDecoder(new TrakMateProtocol()); + TrakMateProtocolDecoder decoder = new TrakMateProtocolDecoder(null); verifyPosition(decoder, text( "^TMPER|354678456723764|1|12.59675|77.56789|123456|030414|2.3|34.0|1|0|0|0.015|3.9|12.0|23.4|23.4|1|1|0|#")); diff --git a/test/org/traccar/protocol/TramigoProtocolDecoderTest.java b/test/org/traccar/protocol/TramigoProtocolDecoderTest.java index 198edfb53..d35c5c54e 100644 --- a/test/org/traccar/protocol/TramigoProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TramigoProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class TramigoProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - TramigoProtocolDecoder decoder = new TramigoProtocolDecoder(new TramigoProtocol()); + TramigoProtocolDecoder decoder = new TramigoProtocolDecoder(null); verifyAttributes(decoder, binary( "8000c426b000a6000101c557037598050d5c8a595472616d69676f3a204d6f76696e672c20302e3132206b6d2045206f66204c617275742054696e2049736c616d6963205072696d617279205363686f6f6c2c2054616970696e672c20506572616b2c204d592c20342e38333134392c203130302e37333038352c204e572077697468207370656564203130206b6d2f682c2030303a34393a30382041756720392020454f46")); diff --git a/test/org/traccar/protocol/TrvProtocolDecoderTest.java b/test/org/traccar/protocol/TrvProtocolDecoderTest.java index a4c0d3343..1a352d1ab 100644 --- a/test/org/traccar/protocol/TrvProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TrvProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class TrvProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - TrvProtocolDecoder decoder = new TrvProtocolDecoder(new TrvProtocol()); + TrvProtocolDecoder decoder = new TrvProtocolDecoder(null); verifyNull(decoder, text( "TRVAP00352121088015548")); diff --git a/test/org/traccar/protocol/Tt8850ProtocolDecoderTest.java b/test/org/traccar/protocol/Tt8850ProtocolDecoderTest.java index 3e8c80e40..e3833bcc7 100644 --- a/test/org/traccar/protocol/Tt8850ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Tt8850ProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class Tt8850ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Tt8850ProtocolDecoder decoder = new Tt8850ProtocolDecoder(new Tt8850Protocol()); + Tt8850ProtocolDecoder decoder = new Tt8850ProtocolDecoder(null); verifyPosition(decoder, text( "\u0000\u0004,007F,0,GTFRI,020102,867844000667538,4142726856,0,0,1,3,1.6,0,997.3,-66.830786,10.483394,20171212171418,0734,0004,041A,4220,69,20171212171657,FF61")); diff --git a/test/org/traccar/protocol/TytanProtocolDecoderTest.java b/test/org/traccar/protocol/TytanProtocolDecoderTest.java index 8600960c6..ed75cee38 100644 --- a/test/org/traccar/protocol/TytanProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TytanProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class TytanProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - TytanProtocolDecoder decoder = new TytanProtocolDecoder(new TytanProtocol()); + TytanProtocolDecoder decoder = new TytanProtocolDecoder(null); verifyPositions(decoder, binary( "B500192000001405125652CA9B1A325FC98D11A9990018020118FC0D")); diff --git a/test/org/traccar/protocol/TzoneProtocolDecoderTest.java b/test/org/traccar/protocol/TzoneProtocolDecoderTest.java index fd1e29312..bd1fc71f4 100644 --- a/test/org/traccar/protocol/TzoneProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TzoneProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class TzoneProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - TzoneProtocolDecoder decoder = new TzoneProtocolDecoder(new TzoneProtocol()); + TzoneProtocolDecoder decoder = new TzoneProtocolDecoder(null); verifyAttributes(decoder, binary( "545a005b24240406010800000866050033819630120911071824000472bd8e5b0008aac01b07019b04bb002f00040b06161154000e100132ff2006161152000e080096ff4606161151000e1e0101ff1406161156000db6405bff490024469e0d0a")); diff --git a/test/org/traccar/protocol/UlbotechProtocolDecoderTest.java b/test/org/traccar/protocol/UlbotechProtocolDecoderTest.java index 7726949ac..1c29ccd4a 100644 --- a/test/org/traccar/protocol/UlbotechProtocolDecoderTest.java +++ b/test/org/traccar/protocol/UlbotechProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class UlbotechProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - UlbotechProtocolDecoder decoder = new UlbotechProtocolDecoder(new UlbotechProtocol()); + UlbotechProtocolDecoder decoder = new UlbotechProtocolDecoder(null); verifyNull(decoder, buffer( "*TS01,353323081464660#")); diff --git a/test/org/traccar/protocol/UproProtocolDecoderTest.java b/test/org/traccar/protocol/UproProtocolDecoderTest.java index 4b886902f..ff7ead961 100644 --- a/test/org/traccar/protocol/UproProtocolDecoderTest.java +++ b/test/org/traccar/protocol/UproProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class UproProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - UproProtocolDecoder decoder = new UproProtocolDecoder(new UproProtocol()); + UproProtocolDecoder decoder = new UproProtocolDecoder(null); verifyPosition(decoder, buffer( "*HQ200999999,AB1&A1656512233362911356523660000230618&B0100060010&C00000<6<&F0000&R2405&V0109&W0000003E&K00100&T65&X(k89860045191536000374)#")); diff --git a/test/org/traccar/protocol/V680ProtocolDecoderTest.java b/test/org/traccar/protocol/V680ProtocolDecoderTest.java index bc60e7380..e3761c3ef 100644 --- a/test/org/traccar/protocol/V680ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/V680ProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class V680ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - V680ProtocolDecoder decoder = new V680ProtocolDecoder(new V680Protocol()); + V680ProtocolDecoder decoder = new V680ProtocolDecoder(null); verifyPosition(decoder, text( "#867967020910610#01234567890#1#0000#AUT#1#0500000000120000#114.036291,E,22.665795,N,111.00,000.00#111116#193333##"), diff --git a/test/org/traccar/protocol/VisiontekProtocolDecoderTest.java b/test/org/traccar/protocol/VisiontekProtocolDecoderTest.java index 91043d892..11596945e 100644 --- a/test/org/traccar/protocol/VisiontekProtocolDecoderTest.java +++ b/test/org/traccar/protocol/VisiontekProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class VisiontekProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - VisiontekProtocolDecoder decoder = new VisiontekProtocolDecoder(new VisiontekProtocol()); + VisiontekProtocolDecoder decoder = new VisiontekProtocolDecoder(null); verifyPosition(decoder, text( "$1,117,28,01,16,15,05,48,1725.0518N,07824.5298E,0620,11,0,185,2062,0,0,0,1,1,1,1,24,00.0000,00.3740,00.0000,VAJRA V1.00,A")); diff --git a/test/org/traccar/protocol/Vt200ProtocolDecoderTest.java b/test/org/traccar/protocol/Vt200ProtocolDecoderTest.java index 9ce01c966..9c224bc8e 100644 --- a/test/org/traccar/protocol/Vt200ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Vt200ProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class Vt200ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Vt200ProtocolDecoder decoder = new Vt200ProtocolDecoder(new Vt200Protocol()); + Vt200ProtocolDecoder decoder = new Vt200ProtocolDecoder(null); verifyPosition(decoder, binary( "28192030961807208200210101b919011818375801245774036424612500160917000003aa008800007b00aa3429")); diff --git a/test/org/traccar/protocol/VtfmsProtocolDecoderTest.java b/test/org/traccar/protocol/VtfmsProtocolDecoderTest.java index 57603de94..2d3940528 100644 --- a/test/org/traccar/protocol/VtfmsProtocolDecoderTest.java +++ b/test/org/traccar/protocol/VtfmsProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class VtfmsProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - VtfmsProtocolDecoder decoder = new VtfmsProtocolDecoder(new VtfmsProtocol()); + VtfmsProtocolDecoder decoder = new VtfmsProtocolDecoder(null); verifyPosition(decoder, text( "(865733028143493,00I76,00,000,,,,,A,133755,210617,10.57354,077.24912,SW,000,00598,00000,K,0017368,1,12.7,,,0.000,,,0,0,0,0,1,1,0,,)074")); diff --git a/test/org/traccar/protocol/WatchProtocolDecoderTest.java b/test/org/traccar/protocol/WatchProtocolDecoderTest.java index bc567bc4d..b7c8d83f9 100644 --- a/test/org/traccar/protocol/WatchProtocolDecoderTest.java +++ b/test/org/traccar/protocol/WatchProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class WatchProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - WatchProtocolDecoder decoder = new WatchProtocolDecoder(new WatchProtocol()); + WatchProtocolDecoder decoder = new WatchProtocolDecoder(null); verifyPosition(decoder, buffer( "[ZJ*014111001332708*0075*0064*AL,040418,052156,A,22.536207,N,113.938673,E,0,0,0,5,100,82,1000,50,00100000,1,255,460,0,9340,3663,35]")); diff --git a/test/org/traccar/protocol/WialonProtocolDecoderTest.java b/test/org/traccar/protocol/WialonProtocolDecoderTest.java index 881b39cf7..b7d2149dd 100644 --- a/test/org/traccar/protocol/WialonProtocolDecoderTest.java +++ b/test/org/traccar/protocol/WialonProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class WialonProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - WialonProtocolDecoder decoder = new WialonProtocolDecoder(new WialonProtocol()); + WialonProtocolDecoder decoder = new WialonProtocolDecoder(null); verifyNull(decoder, text( "#L#2.0;42001300083;;CE45")); diff --git a/test/org/traccar/protocol/WondexProtocolDecoderTest.java b/test/org/traccar/protocol/WondexProtocolDecoderTest.java index c7ccfb457..f01a763a1 100644 --- a/test/org/traccar/protocol/WondexProtocolDecoderTest.java +++ b/test/org/traccar/protocol/WondexProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class WondexProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - WondexProtocolDecoder decoder = new WondexProtocolDecoder(new WondexProtocol()); + WondexProtocolDecoder decoder = new WondexProtocolDecoder(null); verifyPosition(decoder, buffer( "2000000108,20151030145404,76.948633,43.354700,0,140,15,100,1,1325,125.4,10.5,0.0"), diff --git a/test/org/traccar/protocol/WristbandProtocolDecoderTest.java b/test/org/traccar/protocol/WristbandProtocolDecoderTest.java index e85b21a35..cedc06f79 100644 --- a/test/org/traccar/protocol/WristbandProtocolDecoderTest.java +++ b/test/org/traccar/protocol/WristbandProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class WristbandProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - WristbandProtocolDecoder decoder = new WristbandProtocolDecoder(new WristbandProtocol()); + WristbandProtocolDecoder decoder = new WristbandProtocolDecoder(null); verifyNull(decoder, binary( "000102004159583336373535313631303030303934347c56312e307c317c7b4639312330317c30307c30307c33475f7065745f323031382f30352f31362031313a30307d0d0afffefc")); diff --git a/test/org/traccar/protocol/XirgoProtocolDecoderTest.java b/test/org/traccar/protocol/XirgoProtocolDecoderTest.java index cf046c42f..18cf51df0 100644 --- a/test/org/traccar/protocol/XirgoProtocolDecoderTest.java +++ b/test/org/traccar/protocol/XirgoProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class XirgoProtocolDecoderTest extends ProtocolTest { @Test public void testDecodeNew() throws Exception { - XirgoProtocolDecoder decoder = new XirgoProtocolDecoder(new XirgoProtocol()); + XirgoProtocolDecoder decoder = new XirgoProtocolDecoder(null); verifyPosition(decoder, text( "$$352054058132185,4001,2017/04/21,00:01:05,32.54659,-116.90670,143.2,0,0,0,598,0.0,12,0.9,765840,7.0,14.5,19,1,1,0011,8.5,63.2,5,21999,184,255,671,207,100,185##")); @@ -36,7 +36,7 @@ public class XirgoProtocolDecoderTest extends ProtocolTest { @Test public void testDecodeOld() throws Exception { - XirgoProtocolDecoder decoder = new XirgoProtocolDecoder(new XirgoProtocol()); + XirgoProtocolDecoder decoder = new XirgoProtocolDecoder(null); verifyPosition(decoder, text( "$$354660046140722,6001,2013/01/22,15:36:18,25.80907,-80.32531,7.1,19,165.2,11,0.8,11.1,17,1,1,3.9,2##"), diff --git a/test/org/traccar/protocol/Xt013ProtocolDecoderTest.java b/test/org/traccar/protocol/Xt013ProtocolDecoderTest.java index da1f72170..aa44929ab 100644 --- a/test/org/traccar/protocol/Xt013ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Xt013ProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class Xt013ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Xt013ProtocolDecoder decoder = new Xt013ProtocolDecoder(new Xt013Protocol()); + Xt013ProtocolDecoder decoder = new Xt013ProtocolDecoder(null); verifyPosition(decoder, text( "TK,862950021650364,150131090859,+53.267863,+5.767363,0,38,12,0,F,204,08,C94,336C,24,,4.09,1,,,,,,,,"), diff --git a/test/org/traccar/protocol/Xt2400ProtocolDecoderTest.java b/test/org/traccar/protocol/Xt2400ProtocolDecoderTest.java index 35ca282b2..f4a78b5bd 100644 --- a/test/org/traccar/protocol/Xt2400ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Xt2400ProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class Xt2400ProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - Xt2400ProtocolDecoder decoder = new Xt2400ProtocolDecoder(new Xt2400Protocol()); + Xt2400ProtocolDecoder decoder = new Xt2400ProtocolDecoder(null); decoder.setConfig("\n:wycfg pcr[0] 001001030406070809570a13121714100565\n"); diff --git a/test/org/traccar/protocol/YwtProtocolDecoderTest.java b/test/org/traccar/protocol/YwtProtocolDecoderTest.java index bc91efa16..332d15fa5 100644 --- a/test/org/traccar/protocol/YwtProtocolDecoderTest.java +++ b/test/org/traccar/protocol/YwtProtocolDecoderTest.java @@ -8,7 +8,7 @@ public class YwtProtocolDecoderTest extends ProtocolTest { @Test public void testDecode() throws Exception { - YwtProtocolDecoder decoder = new YwtProtocolDecoder(new YwtProtocol()); + YwtProtocolDecoder decoder = new YwtProtocolDecoder(null); verifyPosition(decoder, text( "%RP,1222102985:1,170509033842,E102.146563,N14.582175,,0,320,10,0,00-00-00-00-00-00-00-00-00-00-00-00,,1db2-02b3-52004,3>941.523-32,7>1,19>-16,20>30.9V")); -- cgit v1.2.3