From b5e180da135c48afc3d89665000b6de0e6a330e3 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Fri, 16 Jun 2017 09:30:32 +0500
Subject: Centralized motion detection

---
 test/org/traccar/MotionHandlerTest.java             | 21 +++++++++++++++++++++
 test/org/traccar/ProtocolTest.java                  |  4 ++++
 test/org/traccar/events/MotionEventHandlerTest.java |  2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 test/org/traccar/MotionHandlerTest.java

(limited to 'test/org/traccar')

diff --git a/test/org/traccar/MotionHandlerTest.java b/test/org/traccar/MotionHandlerTest.java
new file mode 100644
index 000000000..d716a5ec7
--- /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.calculateMotion(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);
-- 
cgit v1.2.3