1 files changed, 20 insertions, 1 deletions
diff --git a/test/org/traccar/events/MotionEventHandlerTest.java b/test/org/traccar/events/MotionEventHandlerTest.java
index c44f3f4eb..9df573244 100644
--- a/test/org/traccar/events/MotionEventHandlerTest.java
+++ b/test/org/traccar/events/MotionEventHandlerTest.java
@@ -27,7 +27,7 @@ public class MotionEventHandlerTest extends BaseTest {
     }
 
     @Test
-    public void testMotionEventHandler() throws Exception {
+    public void testMotionWithPosition() throws Exception {
         TripsConfig tripsConfig = new TripsConfig(500, 300 * 1000, 300 * 1000, false, 0);
 
         Position position = new Position();
@@ -64,4 +64,23 @@ public class MotionEventHandlerTest extends BaseTest {
         assertNull(deviceState.getMotionPosition());
     }
 
+    @Test
+    public void testMotionWithStatus() throws Exception {
+        TripsConfig tripsConfig = new TripsConfig(500, 300 * 1000, 300 * 1000, false, 0);
+
+        Position position = new Position();
+        position.setTime(new Date(System.currentTimeMillis() - 360000));
+        position.set(Position.KEY_MOTION, true);
+        DeviceState deviceState = new DeviceState();
+        deviceState.setMotionState(false);
+        deviceState.setMotionPosition(position);
+
+        Event event = MotionEventHandler.updateMotionState(deviceState, tripsConfig);
+
+        assertNotNull(event);
+        assertEquals(Event.TYPE_DEVICE_MOVING, event.getType());
+        assertTrue(deviceState.getMotionState());
+        assertNull(deviceState.getMotionPosition());
+    }
+
 }