From 8ca988c3381b10eeb0939b05ba1cc3e49c7cc8ed Mon Sep 17 00:00:00 2001 From: nativbarak Date: Thu, 12 Apr 2018 19:11:55 +0300 Subject: Fixed wrong order of input, unused import and changed name of protocol --- .../protocol/AustinProtocolDecoderTest.java | 33 ++++++++++++++++++++++ .../protocol/GlobeKeeperProtocolDecoderTest.java | 33 ---------------------- 2 files changed, 33 insertions(+), 33 deletions(-) create mode 100644 test/org/traccar/protocol/AustinProtocolDecoderTest.java delete mode 100644 test/org/traccar/protocol/GlobeKeeperProtocolDecoderTest.java (limited to 'test/org/traccar') diff --git a/test/org/traccar/protocol/AustinProtocolDecoderTest.java b/test/org/traccar/protocol/AustinProtocolDecoderTest.java new file mode 100644 index 000000000..6d59357fb --- /dev/null +++ b/test/org/traccar/protocol/AustinProtocolDecoderTest.java @@ -0,0 +1,33 @@ +package org.traccar.protocol; + +import org.junit.Test; +import org.traccar.ProtocolTest; + +public class AustinNBProtocolDecoderTest extends ProtocolTest { + + @Test + public void testDecode() throws Exception { + + AustinNBProtocolDecoder decoder = new AustinNBProtocolDecoder(new AustinNBProtocol()); + + verifyPosition(decoder, text( + "48666666666;2017-01-01 16:31:01;52,1133308410645;21,1000003814697;310;120;2292;1")); + + verifyPosition(decoder, text( + "48666666666;2017-01-01 16:55:00;52,1636123657227;21,0827789306641;0;90;4000;0")); + + verifyPosition(decoder, text( + "48666666666;2017-01-01 17:32:01;52,1711120605469;21,0866680145264;70;90;1199;0")); + + verifyPosition(decoder, text( + "48601601601;2017-01-01 16:31:01;52,1133308410645;21,1000003814697;310;360;2292;1")); + + verifyPosition(decoder, text( + "48601601601;2017-01-01 16:55:00;52,1636123657227;21,0827789306641;0;360;4000;0")); + + verifyPosition(decoder, text( + "48601601601;2017-01-01 17:32:01;52,1711120605469;21,0866680145264;70;360;1199;0")); + + } + +} diff --git a/test/org/traccar/protocol/GlobeKeeperProtocolDecoderTest.java b/test/org/traccar/protocol/GlobeKeeperProtocolDecoderTest.java deleted file mode 100644 index 918fd9083..000000000 --- a/test/org/traccar/protocol/GlobeKeeperProtocolDecoderTest.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.traccar.protocol; - -import org.junit.Test; -import org.traccar.ProtocolTest; - -public class GlobeKeeperProtocolDecoderTest extends ProtocolTest { - - @Test - public void testDecode() throws Exception { - - GlobeKeeperProtocolDecoder decoder = new GlobeKeeperProtocolDecoder(new GlobeKeeperProtocol()); - - verifyPosition(decoder, text( - "48666666666;2017-01-01 16:31:01;52,1133308410645;21,1000003814697;310;120;2292;1")); - - verifyPosition(decoder, text( - "48666666666;2017-01-01 16:55:00;52,1636123657227;21,0827789306641;0;90;4000;0")); - - verifyPosition(decoder, text( - "48666666666;2017-01-01 17:32:01;52,1711120605469;21,0866680145264;70;90;1199;0")); - - verifyPosition(decoder, text( - "48601601601;2017-01-01 16:31:01;52,1133308410645;21,1000003814697;310;360;2292;1")); - - verifyPosition(decoder, text( - "48601601601;2017-01-01 16:55:00;52,1636123657227;21,0827789306641;0;360;4000;0")); - - verifyPosition(decoder, text( - "48601601601;2017-01-01 17:32:01;52,1711120605469;21,0866680145264;70;360;1199;0")); - - } - -} -- cgit v1.2.3 From d4fb7c70ffdba90e11914cb25a38955f0d50fd42 Mon Sep 17 00:00:00 2001 From: nativbarak Date: Sun, 29 Apr 2018 13:01:42 +0300 Subject: Fixed camel case and added neccasery info --- src/org/traccar/protocol/AustinNBProtocol.java | 45 ------------ .../traccar/protocol/AustinNBProtocolDecoder.java | 69 ------------------- src/org/traccar/protocol/AustinNbProtocol.java | 45 ++++++++++++ .../traccar/protocol/AustinNbProtocolDecoder.java | 80 ++++++++++++++++++++++ .../protocol/AustinNbProtocolDecoderTest.java | 33 +++++++++ .../protocol/AustinProtocolDecoderTest.java | 33 --------- 6 files changed, 158 insertions(+), 147 deletions(-) delete mode 100644 src/org/traccar/protocol/AustinNBProtocol.java delete mode 100644 src/org/traccar/protocol/AustinNBProtocolDecoder.java create mode 100644 src/org/traccar/protocol/AustinNbProtocol.java create mode 100644 src/org/traccar/protocol/AustinNbProtocolDecoder.java create mode 100644 test/org/traccar/protocol/AustinNbProtocolDecoderTest.java delete mode 100644 test/org/traccar/protocol/AustinProtocolDecoderTest.java (limited to 'test/org/traccar') diff --git a/src/org/traccar/protocol/AustinNBProtocol.java b/src/org/traccar/protocol/AustinNBProtocol.java deleted file mode 100644 index c250e9b3d..000000000 --- a/src/org/traccar/protocol/AustinNBProtocol.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2018 Anton Tananaev (anton@traccar.org) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.traccar.protocol; - -import org.jboss.netty.bootstrap.ConnectionlessBootstrap; -import org.jboss.netty.channel.ChannelPipeline; -import org.jboss.netty.handler.codec.string.StringDecoder; -import org.jboss.netty.handler.codec.string.StringEncoder; -import org.traccar.BaseProtocol; -import org.traccar.TrackerServer; - -import java.util.List; - -public class AustinNBProtocol extends BaseProtocol { - - public AustinNBProtocol() { - super("austinnb"); - } - - @Override - public void initTrackerServers(List serverList) { - serverList.add(new TrackerServer(new ConnectionlessBootstrap(), getName()) { - @Override - protected void addSpecificHandlers(ChannelPipeline pipeline) { - pipeline.addLast("stringEncoder", new StringEncoder()); - pipeline.addLast("stringDecoder", new StringDecoder()); - pipeline.addLast("objectDecoder", new AustinNBProtocolDecoder(AustinNBProtocol.this)); - } - }); - } - -} diff --git a/src/org/traccar/protocol/AustinNBProtocolDecoder.java b/src/org/traccar/protocol/AustinNBProtocolDecoder.java deleted file mode 100644 index 4c37ac9a2..000000000 --- a/src/org/traccar/protocol/AustinNBProtocolDecoder.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2018 Anton Tananaev (anton@traccar.org) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.traccar.protocol; - -import org.jboss.netty.channel.Channel; -import org.traccar.BaseProtocolDecoder; -import org.traccar.DeviceSession; -import org.traccar.helper.Parser; -import org.traccar.helper.PatternBuilder; -import org.traccar.model.Position; - -import java.net.SocketAddress; -import java.util.regex.Pattern; - -public class AustinNBProtocolDecoder extends BaseProtocolDecoder { - - public AustinNBProtocolDecoder(AustinNBProtocol protocol) { - super(protocol); - } - - private static final Pattern PATTERN = new PatternBuilder() - .number("(d+);") // imei - .number("(dddd)-(dd)-(dd) ") // date - .number("(dd):(dd):(dd);") // time - .number("(-?d+,d+);") // latitude - .number("(-?d+,d+);") // longitude - .any() - .compile(); - - @Override - protected Object decode( - Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { - - Parser parser = new Parser(PATTERN, (String) msg); - if (!parser.matches()) { - return null; - } - - DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next()); - if (deviceSession == null) { - return null; - } - - Position position = new Position(getProtocolName()); - position.setDeviceId(deviceSession.getDeviceId()); - - position.setTime(parser.nextDateTime()); - - position.setValid(true); - position.setLatitude(Double.parseDouble(parser.next().replace(',', '.'))); - position.setLongitude(Double.parseDouble(parser.next().replace(',', '.'))); - - return position; - } - -} diff --git a/src/org/traccar/protocol/AustinNbProtocol.java b/src/org/traccar/protocol/AustinNbProtocol.java new file mode 100644 index 000000000..7f6739495 --- /dev/null +++ b/src/org/traccar/protocol/AustinNbProtocol.java @@ -0,0 +1,45 @@ +/* + * Copyright 2018 Anton Tananaev (anton@traccar.org) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.protocol; + +import org.jboss.netty.bootstrap.ConnectionlessBootstrap; +import org.jboss.netty.channel.ChannelPipeline; +import org.jboss.netty.handler.codec.string.StringDecoder; +import org.jboss.netty.handler.codec.string.StringEncoder; +import org.traccar.BaseProtocol; +import org.traccar.TrackerServer; + +import java.util.List; + +public class AustinNbProtocol extends BaseProtocol { + + public AustinNbProtocol() { + super("austinnb"); + } + + @Override + public void initTrackerServers(List serverList) { + serverList.add(new TrackerServer(new ConnectionlessBootstrap(), getName()) { + @Override + protected void addSpecificHandlers(ChannelPipeline pipeline) { + pipeline.addLast("stringEncoder", new StringEncoder()); + pipeline.addLast("stringDecoder", new StringDecoder()); + pipeline.addLast("objectDecoder", new AustinNbProtocolDecoder(AustinNbProtocol.this)); + } + }); + } + +} diff --git a/src/org/traccar/protocol/AustinNbProtocolDecoder.java b/src/org/traccar/protocol/AustinNbProtocolDecoder.java new file mode 100644 index 000000000..df1a93102 --- /dev/null +++ b/src/org/traccar/protocol/AustinNbProtocolDecoder.java @@ -0,0 +1,80 @@ +/* + * Copyright 2018 Anton Tananaev (anton@traccar.org) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.protocol; + +import org.jboss.netty.channel.Channel; +import org.traccar.BaseProtocolDecoder; +import org.traccar.DeviceSession; +import org.traccar.helper.Parser; +import org.traccar.helper.PatternBuilder; +import org.traccar.model.Position; + +import java.net.SocketAddress; +import java.util.TimeZone; +import java.util.regex.Pattern; + +public class AustinNbProtocolDecoder extends BaseProtocolDecoder { + + public AustinNbProtocolDecoder(AustinNbProtocol protocol) { + super(protocol); + } + + private static final Pattern PATTERN = new PatternBuilder() + .number("(d+);") // imei + .number("(dddd)-(dd)-(dd) ") // date + .number("(dd):(dd):(dd);") // time + .number("(-?d+,d+);") // latitude + .number("(-?d+,d+);") // longitude + .number("(d+);") // azimuth + .number("(d+);") // angle + .number("(d+);") // range + .number("(d+);") // out of range + .expression("(.*)") // operator + .any() + .compile(); + + @Override + protected Object decode( + Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { + + Parser parser = new Parser(PATTERN, (String) msg); + if (!parser.matches()) { + return null; + } + + DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next()); + if (deviceSession == null) { + return null; + } + + Position position = new Position(getProtocolName()); + position.setDeviceId(deviceSession.getDeviceId()); + + position.setTime(parser.nextDateTime(Parser.DateTimeFormat.YMD_HMS, TimeZone.getDefault().getID())); + + position.setValid(true); + position.setLatitude(Double.parseDouble(parser.next().replace(',', '.'))); + position.setLongitude(Double.parseDouble(parser.next().replace(',', '.'))); + position.set("azimuth", parser.nextInt()); + position.set("angle", parser.nextInt()); + position.set("range", parser.nextInt()); + position.set("out_of_range", parser.nextInt()); + position.set("currier", parser.next()); + + return position; + } + +} diff --git a/test/org/traccar/protocol/AustinNbProtocolDecoderTest.java b/test/org/traccar/protocol/AustinNbProtocolDecoderTest.java new file mode 100644 index 000000000..30291bd2f --- /dev/null +++ b/test/org/traccar/protocol/AustinNbProtocolDecoderTest.java @@ -0,0 +1,33 @@ +package org.traccar.protocol; + +import org.junit.Test; +import org.traccar.ProtocolTest; + +public class AustinNbProtocolDecoderTest extends ProtocolTest { + + @Test + public void testDecode() throws Exception { + + AustinNbProtocolDecoder decoder = new AustinNbProtocolDecoder(new AustinNbProtocol()); + + verifyPosition(decoder, text( + "48666666666;2017-01-01 16:31:01;52,1133308410645;21,1000003814697;310;120;2292;1")); + + verifyPosition(decoder, text( + "48666666666;2017-01-01 16:55:00;52,1636123657227;21,0827789306641;0;90;4000;0")); + + verifyPosition(decoder, text( + "48666666666;2017-01-01 17:32:01;52,1711120605469;21,0866680145264;70;90;1199;0")); + + verifyPosition(decoder, text( + "48601601601;2017-01-01 16:31:01;52,1133308410645;21,1000003814697;310;360;2292;1")); + + verifyPosition(decoder, text( + "48601601601;2017-01-01 16:55:00;52,1636123657227;21,0827789306641;0;360;4000;0")); + + verifyPosition(decoder, text( + "48601601601;2017-01-01 17:32:01;52,1711120605469;21,0866680145264;70;360;1199;0")); + + } + +} diff --git a/test/org/traccar/protocol/AustinProtocolDecoderTest.java b/test/org/traccar/protocol/AustinProtocolDecoderTest.java deleted file mode 100644 index 6d59357fb..000000000 --- a/test/org/traccar/protocol/AustinProtocolDecoderTest.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.traccar.protocol; - -import org.junit.Test; -import org.traccar.ProtocolTest; - -public class AustinNBProtocolDecoderTest extends ProtocolTest { - - @Test - public void testDecode() throws Exception { - - AustinNBProtocolDecoder decoder = new AustinNBProtocolDecoder(new AustinNBProtocol()); - - verifyPosition(decoder, text( - "48666666666;2017-01-01 16:31:01;52,1133308410645;21,1000003814697;310;120;2292;1")); - - verifyPosition(decoder, text( - "48666666666;2017-01-01 16:55:00;52,1636123657227;21,0827789306641;0;90;4000;0")); - - verifyPosition(decoder, text( - "48666666666;2017-01-01 17:32:01;52,1711120605469;21,0866680145264;70;90;1199;0")); - - verifyPosition(decoder, text( - "48601601601;2017-01-01 16:31:01;52,1133308410645;21,1000003814697;310;360;2292;1")); - - verifyPosition(decoder, text( - "48601601601;2017-01-01 16:55:00;52,1636123657227;21,0827789306641;0;360;4000;0")); - - verifyPosition(decoder, text( - "48601601601;2017-01-01 17:32:01;52,1711120605469;21,0866680145264;70;360;1199;0")); - - } - -} -- cgit v1.2.3 From 38a2feaf2208a124ddbb7a48a61cefbd4d7c583f Mon Sep 17 00:00:00 2001 From: nativbarak Date: Sun, 29 Apr 2018 13:42:34 +0300 Subject: Fixed automation test --- test/org/traccar/protocol/AustinNbProtocolDecoderTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'test/org/traccar') diff --git a/test/org/traccar/protocol/AustinNbProtocolDecoderTest.java b/test/org/traccar/protocol/AustinNbProtocolDecoderTest.java index 30291bd2f..9608e32a6 100644 --- a/test/org/traccar/protocol/AustinNbProtocolDecoderTest.java +++ b/test/org/traccar/protocol/AustinNbProtocolDecoderTest.java @@ -11,22 +11,22 @@ public class AustinNbProtocolDecoderTest extends ProtocolTest { AustinNbProtocolDecoder decoder = new AustinNbProtocolDecoder(new AustinNbProtocol()); verifyPosition(decoder, text( - "48666666666;2017-01-01 16:31:01;52,1133308410645;21,1000003814697;310;120;2292;1")); + "48666666666;2017-01-01 16:31:01;52,1133308410645;21,1000003814697;310;120;2292;1;ORANGE")); verifyPosition(decoder, text( - "48666666666;2017-01-01 16:55:00;52,1636123657227;21,0827789306641;0;90;4000;0")); + "48666666666;2017-01-01 16:55:00;52,1636123657227;21,0827789306641;0;90;4000;0;ORANGE")); verifyPosition(decoder, text( - "48666666666;2017-01-01 17:32:01;52,1711120605469;21,0866680145264;70;90;1199;0")); + "48666666666;2017-01-01 17:32:01;52,1711120605469;21,0866680145264;70;90;1199;0;ORANGE")); verifyPosition(decoder, text( - "48601601601;2017-01-01 16:31:01;52,1133308410645;21,1000003814697;310;360;2292;1")); + "48601601601;2017-01-01 16:31:01;52,1133308410645;21,1000003814697;310;360;2292;1;ORANGE")); verifyPosition(decoder, text( - "48601601601;2017-01-01 16:55:00;52,1636123657227;21,0827789306641;0;360;4000;0")); + "48601601601;2017-01-01 16:55:00;52,1636123657227;21,0827789306641;0;360;4000;0;ORANGE")); verifyPosition(decoder, text( - "48601601601;2017-01-01 17:32:01;52,1711120605469;21,0866680145264;70;360;1199;0")); + "48601601601;2017-01-01 17:32:01;52,1711120605469;21,0866680145264;70;360;1199;0;ORANGE")); } -- cgit v1.2.3