diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-06-16 18:44:32 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-16 18:44:32 +1200 |
commit | fe4ea97dabc55c4585d8b32bd4dae32cd255add3 (patch) | |
tree | 682c24e519446f419de1f01ac5e3879f49934a93 /test/org/traccar | |
parent | 65bec416c56715cd4a24ef69f136e4f67be56851 (diff) | |
parent | b1d5a5cfd165d2b52cf4dcdc57a6825e0ff1db8f (diff) | |
download | traccar-server-fe4ea97dabc55c4585d8b32bd4dae32cd255add3.tar.gz traccar-server-fe4ea97dabc55c4585d8b32bd4dae32cd255add3.tar.bz2 traccar-server-fe4ea97dabc55c4585d8b32bd4dae32cd255add3.zip |
Merge pull request #3256 from Abyss777/motion_detection
Centralized motion detection
Diffstat (limited to 'test/org/traccar')
-rw-r--r-- | test/org/traccar/DistanceHandlerTest.java | 2 | ||||
-rw-r--r-- | test/org/traccar/MotionHandlerTest.java | 21 | ||||
-rw-r--r-- | test/org/traccar/ProtocolTest.java | 4 | ||||
-rw-r--r-- | test/org/traccar/events/MotionEventHandlerTest.java | 2 |
4 files changed, 27 insertions, 2 deletions
diff --git a/test/org/traccar/DistanceHandlerTest.java b/test/org/traccar/DistanceHandlerTest.java index b14caaec5..66b2f3d1c 100644 --- a/test/org/traccar/DistanceHandlerTest.java +++ b/test/org/traccar/DistanceHandlerTest.java @@ -12,7 +12,7 @@ public class DistanceHandlerTest { DistanceHandler distanceHandler = new DistanceHandler(); - Position position = distanceHandler.calculateDistance(new Position()); + Position position = distanceHandler.handlePosition(new Position()); assertEquals(0.0, position.getAttributes().get(Position.KEY_DISTANCE)); assertEquals(0.0, position.getAttributes().get(Position.KEY_TOTAL_DISTANCE)); diff --git a/test/org/traccar/MotionHandlerTest.java b/test/org/traccar/MotionHandlerTest.java new file mode 100644 index 000000000..fc6dce033 --- /dev/null +++ b/test/org/traccar/MotionHandlerTest.java @@ -0,0 +1,21 @@ +package org.traccar; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.traccar.model.Position; + +public class MotionHandlerTest { + + @Test + public void testCalculateMotion() throws Exception { + + MotionHandler motionHandler = new MotionHandler(0.01); + + Position position = motionHandler.handlePosition(new Position()); + + assertEquals(false, position.getAttributes().get(Position.KEY_MOTION)); + + } + +} diff --git a/test/org/traccar/ProtocolTest.java b/test/org/traccar/ProtocolTest.java index ee5811e49..eaecfab0b 100644 --- a/test/org/traccar/ProtocolTest.java +++ b/test/org/traccar/ProtocolTest.java @@ -237,6 +237,10 @@ public class ProtocolTest extends BaseTest { Assert.assertTrue(attributes.get(Position.KEY_CHARGE) instanceof Boolean); } + if (attributes.containsKey(Position.KEY_MOTION)) { + Assert.assertTrue(attributes.get(Position.KEY_MOTION) instanceof Boolean); + } + if (position.getNetwork() != null && position.getNetwork().getCellTowers() != null) { for (CellTower cellTower : position.getNetwork().getCellTowers()) { checkInteger(cellTower.getMobileCountryCode(), 0, 999); diff --git a/test/org/traccar/events/MotionEventHandlerTest.java b/test/org/traccar/events/MotionEventHandlerTest.java index 622680d91..f05ef54d5 100644 --- a/test/org/traccar/events/MotionEventHandlerTest.java +++ b/test/org/traccar/events/MotionEventHandlerTest.java @@ -18,7 +18,7 @@ public class MotionEventHandlerTest extends BaseTest { MotionEventHandler motionEventHandler = new MotionEventHandler(); Position position = new Position(); - position.setSpeed(10.0); + position.set(Position.KEY_MOTION, true); position.setValid(true); Collection<Event> events = motionEventHandler.analyzePosition(position); assertNotNull(events); |