diff options
author | Christoph Krey <c@ckrey.de> | 2018-04-16 10:45:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-16 10:45:11 +0200 |
commit | 3a602dd133b533cc69d5986d64a00fb3ed670f75 (patch) | |
tree | 97ff753db310a49ae7e53240b1db07fb8475679e /test/org/traccar/ProtocolTest.java | |
parent | 232de5f0daef98f31b28d177d991fdbfa191f195 (diff) | |
parent | 6d4b8df25c7e942b9ad594db9444fe15bcb16be9 (diff) | |
download | traccar-server-3a602dd133b533cc69d5986d64a00fb3ed670f75.tar.gz traccar-server-3a602dd133b533cc69d5986d64a00fb3ed670f75.tar.bz2 traccar-server-3a602dd133b533cc69d5986d64a00fb3ed670f75.zip |
Merge pull request #4 from traccar/master
upgrade to current master
Diffstat (limited to 'test/org/traccar/ProtocolTest.java')
-rw-r--r-- | test/org/traccar/ProtocolTest.java | 131 |
1 files changed, 66 insertions, 65 deletions
diff --git a/test/org/traccar/ProtocolTest.java b/test/org/traccar/ProtocolTest.java index 1daefabd6..75a98000b 100644 --- a/test/org/traccar/ProtocolTest.java +++ b/test/org/traccar/ProtocolTest.java @@ -5,12 +5,11 @@ import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.handler.codec.http.DefaultHttpRequest; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpVersion; -import org.junit.Assert; +import org.traccar.helper.DataConverter; import org.traccar.model.CellTower; import org.traccar.model.Command; import org.traccar.model.Position; -import javax.xml.bind.DatatypeConverter; import java.nio.ByteOrder; import java.nio.charset.StandardCharsets; import java.text.DateFormat; @@ -21,17 +20,21 @@ import java.util.List; import java.util.Map; import java.util.TimeZone; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + public class ProtocolTest extends BaseTest { protected Position position(String time, boolean valid, double lat, double lon) throws ParseException { Position position = new Position(); - if (time != null) { - DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); - dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - position.setTime(dateFormat.parse(time)); - } + DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); + dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + position.setTime(dateFormat.parse(time)); position.setValid(valid); position.setLatitude(lat); position.setLongitude(lon); @@ -53,7 +56,7 @@ public class ProtocolTest extends BaseTest { protected ChannelBuffer binary(ByteOrder endianness, String... data) { return ChannelBuffers.wrappedBuffer( - endianness, DatatypeConverter.parseHexBinary(concatenateStrings(data))); + endianness, DataConverter.parseHex(concatenateStrings(data))); } protected String text(String... data) { @@ -79,19 +82,19 @@ public class ProtocolTest extends BaseTest { } protected void verifyNotNull(BaseProtocolDecoder decoder, Object object) throws Exception { - Assert.assertNotNull(decoder.decode(null, null, object)); + assertNotNull(decoder.decode(null, null, object)); } protected void verifyNull(Object object) throws Exception { - Assert.assertNull(object); + assertNull(object); } protected void verifyNull(BaseProtocolDecoder decoder, Object object) throws Exception { - Assert.assertNull(decoder.decode(null, null, object)); + assertNull(decoder.decode(null, null, object)); } protected void verifyAttribute(BaseProtocolDecoder decoder, Object object, String key, Object expected) throws Exception { - Assert.assertEquals(expected, ((Position) decoder.decode(null, null, object)).getAttributes().get(key)); + assertEquals(expected, ((Position) decoder.decode(null, null, object)).getAttributes().get(key)); } protected void verifyAttributes(BaseProtocolDecoder decoder, Object object) throws Exception { @@ -120,9 +123,9 @@ public class ProtocolTest extends BaseTest { private void verifyDecodedList(Object decodedObject, boolean checkLocation, Position expected) { - Assert.assertNotNull("list is null", decodedObject); - Assert.assertTrue("not a list", decodedObject instanceof List); - Assert.assertFalse("list is empty", ((List) decodedObject).isEmpty()); + assertNotNull("list is null", decodedObject); + assertTrue("not a list", decodedObject instanceof List); + assertFalse("list is empty", ((List) decodedObject).isEmpty()); for (Object item : (List) decodedObject) { verifyDecodedPosition(item, checkLocation, false, expected); @@ -132,8 +135,8 @@ public class ProtocolTest extends BaseTest { private void verifyDecodedPosition(Object decodedObject, boolean checkLocation, boolean checkAttributes, Position expected) { - Assert.assertNotNull("position is null", decodedObject); - Assert.assertTrue("not a position", decodedObject instanceof Position); + assertNotNull("position is null", decodedObject); + assertTrue("not a position", decodedObject instanceof Position); Position position = (Position) decodedObject; @@ -144,125 +147,125 @@ public class ProtocolTest extends BaseTest { if (expected.getFixTime() != null) { DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - Assert.assertEquals("time", dateFormat.format(expected.getFixTime()), dateFormat.format(position.getFixTime())); + assertEquals("time", dateFormat.format(expected.getFixTime()), dateFormat.format(position.getFixTime())); } - Assert.assertEquals("valid", expected.getValid(), position.getValid()); - Assert.assertEquals("latitude", expected.getLatitude(), position.getLatitude(), 0.00001); - Assert.assertEquals("longitude", expected.getLongitude(), position.getLongitude(), 0.00001); + assertEquals("valid", expected.getValid(), position.getValid()); + assertEquals("latitude", expected.getLatitude(), position.getLatitude(), 0.00001); + assertEquals("longitude", expected.getLongitude(), position.getLongitude(), 0.00001); } else { - Assert.assertNotNull(position.getFixTime()); - Assert.assertTrue("year > 1999", position.getFixTime().after(new Date(915148800000L))); - Assert.assertTrue("time < +25 hours", + assertNotNull(position.getFixTime()); + assertTrue("year > 1999", position.getFixTime().after(new Date(915148800000L))); + assertTrue("time < +25 hours", position.getFixTime().getTime() < System.currentTimeMillis() + 25 * 3600000); - Assert.assertTrue("latitude >= -90", position.getLatitude() >= -90); - Assert.assertTrue("latitude <= 90", position.getLatitude() <= 90); + assertTrue("latitude >= -90", position.getLatitude() >= -90); + assertTrue("latitude <= 90", position.getLatitude() <= 90); - Assert.assertTrue("longitude >= -180", position.getLongitude() >= -180); - Assert.assertTrue("longitude <= 180", position.getLongitude() <= 180); + assertTrue("longitude >= -180", position.getLongitude() >= -180); + assertTrue("longitude <= 180", position.getLongitude() <= 180); } - Assert.assertTrue("altitude >= -12262", position.getAltitude() >= -12262); - Assert.assertTrue("altitude <= 18000", position.getAltitude() <= 18000); + assertTrue("altitude >= -12262", position.getAltitude() >= -12262); + assertTrue("altitude <= 18000", position.getAltitude() <= 18000); - Assert.assertTrue("speed >= 0", position.getSpeed() >= 0); - Assert.assertTrue("speed <= 869", position.getSpeed() <= 869); + assertTrue("speed >= 0", position.getSpeed() >= 0); + assertTrue("speed <= 869", position.getSpeed() <= 869); - Assert.assertTrue("course >= 0", position.getCourse() >= 0); - Assert.assertTrue("course <= 360", position.getCourse() <= 360); + assertTrue("course >= 0", position.getCourse() >= 0); + assertTrue("course <= 360", position.getCourse() <= 360); - Assert.assertNotNull("protocol is null", position.getProtocol()); + assertNotNull("protocol is null", position.getProtocol()); } Map<String, Object> attributes = position.getAttributes(); if (checkAttributes) { - Assert.assertFalse("no attributes", attributes.isEmpty()); + assertFalse("no attributes", attributes.isEmpty()); } if (attributes.containsKey(Position.KEY_INDEX)) { - Assert.assertTrue(attributes.get(Position.KEY_INDEX) instanceof Number); + assertTrue(attributes.get(Position.KEY_INDEX) instanceof Number); } if (attributes.containsKey(Position.KEY_HDOP)) { - Assert.assertTrue(attributes.get(Position.KEY_HDOP) instanceof Number); + assertTrue(attributes.get(Position.KEY_HDOP) instanceof Number); } if (attributes.containsKey(Position.KEY_VDOP)) { - Assert.assertTrue(attributes.get(Position.KEY_VDOP) instanceof Number); + assertTrue(attributes.get(Position.KEY_VDOP) instanceof Number); } if (attributes.containsKey(Position.KEY_PDOP)) { - Assert.assertTrue(attributes.get(Position.KEY_PDOP) instanceof Number); + assertTrue(attributes.get(Position.KEY_PDOP) instanceof Number); } if (attributes.containsKey(Position.KEY_SATELLITES)) { - Assert.assertTrue(attributes.get(Position.KEY_SATELLITES) instanceof Number); + assertTrue(attributes.get(Position.KEY_SATELLITES) instanceof Number); } if (attributes.containsKey(Position.KEY_SATELLITES_VISIBLE)) { - Assert.assertTrue(attributes.get(Position.KEY_SATELLITES_VISIBLE) instanceof Number); + assertTrue(attributes.get(Position.KEY_SATELLITES_VISIBLE) instanceof Number); } if (attributes.containsKey(Position.KEY_RSSI)) { - Assert.assertTrue(attributes.get(Position.KEY_RSSI) instanceof Number); + assertTrue(attributes.get(Position.KEY_RSSI) instanceof Number); } if (attributes.containsKey(Position.KEY_ODOMETER)) { - Assert.assertTrue(attributes.get(Position.KEY_ODOMETER) instanceof Number); + assertTrue(attributes.get(Position.KEY_ODOMETER) instanceof Number); } if (attributes.containsKey(Position.KEY_RPM)) { - Assert.assertTrue(attributes.get(Position.KEY_RPM) instanceof Number); + assertTrue(attributes.get(Position.KEY_RPM) instanceof Number); } if (attributes.containsKey(Position.KEY_FUEL_LEVEL)) { - Assert.assertTrue(attributes.get(Position.KEY_FUEL_LEVEL) instanceof Number); + assertTrue(attributes.get(Position.KEY_FUEL_LEVEL) instanceof Number); } if (attributes.containsKey(Position.KEY_POWER)) { - Assert.assertTrue(attributes.get(Position.KEY_POWER) instanceof Number); + assertTrue(attributes.get(Position.KEY_POWER) instanceof Number); } if (attributes.containsKey(Position.KEY_BATTERY)) { - Assert.assertTrue(attributes.get(Position.KEY_BATTERY) instanceof Number); + assertTrue(attributes.get(Position.KEY_BATTERY) instanceof Number); } if (attributes.containsKey(Position.KEY_BATTERY_LEVEL)) { int batteryLevel = ((Number) attributes.get(Position.KEY_BATTERY_LEVEL)).intValue(); - Assert.assertTrue(batteryLevel <= 100 && batteryLevel >= 0); + assertTrue(batteryLevel <= 100 && batteryLevel >= 0); } if (attributes.containsKey(Position.KEY_CHARGE)) { - Assert.assertTrue(attributes.get(Position.KEY_CHARGE) instanceof Boolean); + assertTrue(attributes.get(Position.KEY_CHARGE) instanceof Boolean); } if (attributes.containsKey(Position.KEY_IGNITION)) { - Assert.assertTrue(attributes.get(Position.KEY_IGNITION) instanceof Boolean); + assertTrue(attributes.get(Position.KEY_IGNITION) instanceof Boolean); } if (attributes.containsKey(Position.KEY_MOTION)) { - Assert.assertTrue(attributes.get(Position.KEY_MOTION) instanceof Boolean); + assertTrue(attributes.get(Position.KEY_MOTION) instanceof Boolean); } if (attributes.containsKey(Position.KEY_ARCHIVE)) { - Assert.assertTrue(attributes.get(Position.KEY_ARCHIVE) instanceof Boolean); + assertTrue(attributes.get(Position.KEY_ARCHIVE) instanceof Boolean); } if (attributes.containsKey(Position.KEY_DRIVER_UNIQUE_ID)) { - Assert.assertTrue(attributes.get(Position.KEY_DRIVER_UNIQUE_ID) instanceof String); + assertTrue(attributes.get(Position.KEY_DRIVER_UNIQUE_ID) instanceof String); } if (attributes.containsKey(Position.KEY_STEPS)) { - Assert.assertTrue(attributes.get(Position.KEY_STEPS) instanceof Number); + assertTrue(attributes.get(Position.KEY_STEPS) instanceof Number); } if (attributes.containsKey(Position.KEY_ROAMING)) { - Assert.assertTrue(attributes.get(Position.KEY_ROAMING) instanceof Boolean); + assertTrue(attributes.get(Position.KEY_ROAMING) instanceof Boolean); } if (position.getNetwork() != null && position.getNetwork().getCellTowers() != null) { @@ -277,11 +280,11 @@ public class ProtocolTest extends BaseTest { } private void checkInteger(Object value, int min, int max) { - Assert.assertNotNull("value is null", value); - Assert.assertTrue("not int or long", value instanceof Integer || value instanceof Long); + assertNotNull("value is null", value); + assertTrue("not int or long", value instanceof Integer || value instanceof Long); long number = ((Number) value).longValue(); - Assert.assertTrue("value too low", number >= min); - Assert.assertTrue("value too high", number <= max); + assertTrue("value too low", number >= min); + assertTrue("value too high", number <= max); } protected void verifyCommand( @@ -290,11 +293,9 @@ public class ProtocolTest extends BaseTest { } protected void verifyFrame(ChannelBuffer expected, Object object) { - - Assert.assertNotNull("buffer is null", object); - Assert.assertTrue("not a buffer", object instanceof ChannelBuffer); - Assert.assertEquals(ChannelBuffers.hexDump(expected), ChannelBuffers.hexDump((ChannelBuffer) object)); - + assertNotNull("buffer is null", object); + assertTrue("not a buffer", object instanceof ChannelBuffer); + assertEquals(ChannelBuffers.hexDump(expected), ChannelBuffers.hexDump((ChannelBuffer) object)); } } |