- Added IgnitionEventHandler

- Added unit test for some EventHandlers
- Changed a bit IdentityManager to fit EventHandlerTest

12 files changed, 239 insertions, 5 deletions

diff --git a/src/org/traccar/database/IdentityManager.java b/src/org/traccar/database/IdentityManager.java
index 8c0de8b38..8507d1f2e 100644
--- a/src/org/traccar/database/IdentityManager.java
+++ b/src/org/traccar/database/IdentityManager.java
@@ -26,4 +26,6 @@ public interface IdentityManager {
 
     Position getLastPosition(long deviceId);
 
+    boolean isLatestPosition(Position position);
+
 }
diff --git a/src/org/traccar/events/GeofenceEventHandler.java b/src/org/traccar/events/GeofenceEventHandler.java
index a0291dcfa..6126331bd 100644
--- a/src/org/traccar/events/GeofenceEventHandler.java
+++ b/src/org/traccar/events/GeofenceEventHandler.java
@@ -40,7 +40,7 @@ public class GeofenceEventHandler extends BaseEventHandler {
         if (device == null) {
             return null;
         }
-        if (!Context.getDeviceManager().isLatestPosition(position) || !position.getValid()) {
+        if (!Context.getIdentityManager().isLatestPosition(position) || !position.getValid()) {
             return null;
         }
 
diff --git a/src/org/traccar/events/IgnitionEventHandler.java b/src/org/traccar/events/IgnitionEventHandler.java
new file mode 100644
index 000000000..297049ccd
--- /dev/null
+++ b/src/org/traccar/events/IgnitionEventHandler.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * 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.events;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.traccar.BaseEventHandler;
+import org.traccar.Context;
+import org.traccar.model.Device;
+import org.traccar.model.Event;
+import org.traccar.model.Position;
+
+public class IgnitionEventHandler extends BaseEventHandler {
+
+    @Override
+    protected Collection<Event> analyzePosition(Position position) {
+        Device device = Context.getIdentityManager().getDeviceById(position.getDeviceId());
+        if (device == null) {
+            return null;
+        }
+        if (!Context.getIdentityManager().isLatestPosition(position) || !position.getValid()) {
+            return null;
+        }
+
+        Collection<Event> result = null;
+
+        boolean ignition = false;
+        Object ignitionObject = position.getAttributes().get(Position.KEY_IGNITION);
+        if (ignitionObject != null && Boolean.parseBoolean(ignitionObject.toString())) {
+            ignition = true;
+        }
+
+        boolean oldIgnition = false;
+        Object oldIgnitionObject = null;
+        Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId());
+        if (lastPosition != null) {
+            oldIgnitionObject = lastPosition.getAttributes().get(Position.KEY_IGNITION);
+        }
+        if (oldIgnitionObject != null && Boolean.parseBoolean(oldIgnitionObject.toString())) {
+            oldIgnition = true;
+        }
+
+        if (ignition && !oldIgnition) {
+            result = new ArrayList<>();
+            result.add(new Event(Event.TYPE_IGNITION_ON, position.getDeviceId(), position.getId()));
+        } else if (!ignition && oldIgnition) {
+            result = new ArrayList<>();
+            result.add(new Event(Event.TYPE_IGNITION_OFF, position.getDeviceId(), position.getId()));
+        }
+        return result;
+    }
+
+}
diff --git a/src/org/traccar/events/MotionEventHandler.java b/src/org/traccar/events/MotionEventHandler.java
index ddb99185f..7178f7036 100644
--- a/src/org/traccar/events/MotionEventHandler.java
+++ b/src/org/traccar/events/MotionEventHandler.java
@@ -35,14 +35,14 @@ public class MotionEventHandler extends BaseEventHandler {
         if (device == null) {
             return null;
         }
-        if (!Context.getDeviceManager().isLatestPosition(position) || !position.getValid()) {
+        if (!Context.getIdentityManager().isLatestPosition(position) || !position.getValid()) {
             return null;
         }
 
         Collection<Event> result = null;
         double speed = position.getSpeed();
         double oldSpeed = 0;
-        Position lastPosition = Context.getDeviceManager().getLastPosition(position.getDeviceId());
+        Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId());
         if (lastPosition != null) {
             oldSpeed = lastPosition.getSpeed();
         }
diff --git a/src/org/traccar/events/OverspeedEventHandler.java b/src/org/traccar/events/OverspeedEventHandler.java
index dbdb01ffb..c739348eb 100644
--- a/src/org/traccar/events/OverspeedEventHandler.java
+++ b/src/org/traccar/events/OverspeedEventHandler.java
@@ -42,7 +42,7 @@ public class OverspeedEventHandler extends BaseEventHandler {
         if (device == null) {
             return null;
         }
-        if (!Context.getDeviceManager().isLatestPosition(position) || !position.getValid()) {
+        if (!Context.getIdentityManager().isLatestPosition(position) || !position.getValid()) {
             return null;
         }
 
@@ -58,7 +58,7 @@ public class OverspeedEventHandler extends BaseEventHandler {
         }
         double oldSpeed = 0;
         if (notRepeat) {
-            Position lastPosition = Context.getDeviceManager().getLastPosition(position.getDeviceId());
+            Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId());
             if (lastPosition != null) {
                 oldSpeed = lastPosition.getSpeed();
             }
diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java
index a2c346688..c3c8b5320 100644
--- a/src/org/traccar/model/Event.java
+++ b/src/org/traccar/model/Event.java
@@ -50,6 +50,9 @@ public class Event extends Message {
 
     public static final String TYPE_ALARM = "alarm";
 
+    public static final String TYPE_IGNITION_ON = "ignitionOn";
+    public static final String TYPE_IGNITION_OFF = "ignitionOff";
+
     private Date serverTime;
 
     public Date getServerTime() {
diff --git a/test/org/traccar/EventHandlerTest.java b/test/org/traccar/EventHandlerTest.java
new file mode 100644
index 000000000..423a5084f
--- /dev/null
+++ b/test/org/traccar/EventHandlerTest.java
@@ -0,0 +1,43 @@
+package org.traccar;
+
+import org.traccar.database.IdentityManager;
+import org.traccar.model.Device;
+import org.traccar.model.Position;
+
+public class EventHandlerTest {
+    
+    static {
+        Context.init(new IdentityManager() {
+
+            private Device createDevice() {
+                Device device = new Device();
+                device.setId(1);
+                device.setName("test");
+                device.setUniqueId("123456789012345");
+                return device;
+            }
+
+            @Override
+            public Device getDeviceById(long id) {
+                return createDevice();
+            }
+
+            @Override
+            public Device getDeviceByUniqueId(String uniqueId) {
+                return createDevice();
+            }
+            
+            @Override
+            public Position getLastPosition(long deviceId) {
+                return null;
+            }
+            
+            @Override
+            public boolean isLatestPosition(Position position) {
+                return true;
+            }
+
+        });
+    }
+
+}
diff --git a/test/org/traccar/ProtocolTest.java b/test/org/traccar/ProtocolTest.java
index 07a19b691..c6c957679 100644
--- a/test/org/traccar/ProtocolTest.java
+++ b/test/org/traccar/ProtocolTest.java
@@ -49,6 +49,11 @@ public class ProtocolTest {
             public Position getLastPosition(long deviceId) {
                 return null;
             }
+            
+            @Override
+            public boolean isLatestPosition(Position position) {
+                return true;
+            }
 
         });
     }
diff --git a/test/org/traccar/events/AlertEventHandlerTest.java b/test/org/traccar/events/AlertEventHandlerTest.java
new file mode 100644
index 000000000..c6d5e07d9
--- /dev/null
+++ b/test/org/traccar/events/AlertEventHandlerTest.java
@@ -0,0 +1,28 @@
+package org.traccar.events;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Collection;
+
+import org.junit.Test;
+import org.traccar.EventHandlerTest;
+import org.traccar.model.Event;
+import org.traccar.model.Position;
+
+public class AlertEventHandlerTest extends EventHandlerTest {
+
+    @Test
+    public void testAlertEventHandler() throws Exception {
+        
+        AlertEventHandler alertEventHandler = new AlertEventHandler();
+        
+        Position position = new Position();
+        position.set(Position.KEY_ALARM, Position.ALARM_GENERAL);
+        Collection<Event> events = alertEventHandler.analyzePosition(position);
+        assertNotNull(events);
+        Event event = (Event) events.toArray()[0];
+        assertEquals(Event.TYPE_ALARM, event.getType());
+    }
+
+}
diff --git a/test/org/traccar/events/CommandResultEventHandlerTest.java b/test/org/traccar/events/CommandResultEventHandlerTest.java
new file mode 100644
index 000000000..b09898b4a
--- /dev/null
+++ b/test/org/traccar/events/CommandResultEventHandlerTest.java
@@ -0,0 +1,28 @@
+package org.traccar.events;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Collection;
+
+import org.junit.Test;
+import org.traccar.EventHandlerTest;
+import org.traccar.model.Event;
+import org.traccar.model.Position;
+
+public class CommandResultEventHandlerTest extends EventHandlerTest {
+
+    @Test
+    public void testCommandResultEventHandler() throws Exception {
+        
+        CommandResultEventHandler commandResultEventHandler = new CommandResultEventHandler();
+        
+        Position position = new Position();
+        position.set(Position.KEY_RESULT, "Test Result");
+        Collection<Event> events = commandResultEventHandler.analyzePosition(position);
+        assertNotNull(events);
+        Event event = (Event) events.toArray()[0];
+        assertEquals(Event.TYPE_COMMAND_RESULT, event.getType());
+    }
+
+}
diff --git a/test/org/traccar/events/IgnitionEventHandlerTest.java b/test/org/traccar/events/IgnitionEventHandlerTest.java
new file mode 100644
index 000000000..96df6e1ed
--- /dev/null
+++ b/test/org/traccar/events/IgnitionEventHandlerTest.java
@@ -0,0 +1,29 @@
+package org.traccar.events;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Collection;
+
+import org.junit.Test;
+import org.traccar.EventHandlerTest;
+import org.traccar.model.Event;
+import org.traccar.model.Position;
+
+public class IgnitionEventHandlerTest extends EventHandlerTest{
+    
+    @Test
+    public void testIgnitionEventHandler() throws Exception {
+        
+        IgnitionEventHandler ignitionEventHandler = new IgnitionEventHandler();
+        
+        Position position = new Position();
+        position.set(Position.KEY_IGNITION, true);
+        position.setValid(true);
+        Collection<Event> events = ignitionEventHandler.analyzePosition(position);
+        assertNotNull(events);
+        Event event = (Event) events.toArray()[0];
+        assertEquals(Event.TYPE_IGNITION_ON, event.getType());
+    }
+
+}
diff --git a/test/org/traccar/events/MotionEventHandlerTest.java b/test/org/traccar/events/MotionEventHandlerTest.java
new file mode 100644
index 000000000..34b2c481d
--- /dev/null
+++ b/test/org/traccar/events/MotionEventHandlerTest.java
@@ -0,0 +1,29 @@
+package org.traccar.events;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Collection;
+
+import org.junit.Test;
+import org.traccar.EventHandlerTest;
+import org.traccar.model.Event;
+import org.traccar.model.Position;
+
+public class MotionEventHandlerTest extends EventHandlerTest {
+    
+    @Test
+    public void testMotionEventHandler() throws Exception {
+        
+        MotionEventHandler motionEventHandler = new MotionEventHandler();
+        
+        Position position = new Position();
+        position.setSpeed(10.0);
+        position.setValid(true);
+        Collection<Event> events = motionEventHandler.analyzePosition(position);
+        assertNotNull(events);
+        Event event = (Event) events.toArray()[0];
+        assertEquals(Event.TYPE_DEVICE_MOVING, event.getType());
+    }
+
+}