aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2022-10-26 09:28:03 -0700
committerGitHub <noreply@github.com>2022-10-26 09:28:03 -0700
commit7fa60c7f1fc743b90fa988943da28e48148d8b99 (patch)
tree4fb735b40033de8ae871eebf28a829c5fdf1b977
parent78a0df7befc84b7d138b403b137f26f9df379c3d (diff)
parent907e5d1669c154e266383a275c1212baea1bda2a (diff)
downloadtrackermap-server-7fa60c7f1fc743b90fa988943da28e48148d8b99.tar.gz
trackermap-server-7fa60c7f1fc743b90fa988943da28e48148d8b99.tar.bz2
trackermap-server-7fa60c7f1fc743b90fa988943da28e48148d8b99.zip
Merge pull request #4970 from jcardus/patch-1
Fix maintenance bugs
-rw-r--r--src/main/java/org/traccar/handler/events/MaintenanceEventHandler.java14
-rw-r--r--src/test/java/org/traccar/handler/events/MaintenanceEventHandlerTest.java60
2 files changed, 68 insertions, 6 deletions
diff --git a/src/main/java/org/traccar/handler/events/MaintenanceEventHandler.java b/src/main/java/org/traccar/handler/events/MaintenanceEventHandler.java
index 4fcfcd079..909950acf 100644
--- a/src/main/java/org/traccar/handler/events/MaintenanceEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/MaintenanceEventHandler.java
@@ -51,13 +51,15 @@ public class MaintenanceEventHandler extends BaseEventHandler {
if (maintenance.getPeriod() != 0) {
double oldValue = lastPosition.getDouble(maintenance.getType());
double newValue = position.getDouble(maintenance.getType());
- if (oldValue != 0.0 && newValue != 0.0
- && (long) ((oldValue - maintenance.getStart()) / maintenance.getPeriod())
+ if (oldValue != 0.0 && newValue != 0.0 && newValue >= maintenance.getStart()) {
+ if (oldValue < maintenance.getStart()
+ || (long) ((oldValue - maintenance.getStart()) / maintenance.getPeriod())
< (long) ((newValue - maintenance.getStart()) / maintenance.getPeriod())) {
- Event event = new Event(Event.TYPE_MAINTENANCE, position);
- event.setMaintenanceId(maintenance.getId());
- event.set(maintenance.getType(), newValue);
- events.put(event, position);
+ Event event = new Event(Event.TYPE_MAINTENANCE, position);
+ event.setMaintenanceId(maintenance.getId());
+ event.set(maintenance.getType(), newValue);
+ events.put(event, position);
+ }
}
}
}
diff --git a/src/test/java/org/traccar/handler/events/MaintenanceEventHandlerTest.java b/src/test/java/org/traccar/handler/events/MaintenanceEventHandlerTest.java
new file mode 100644
index 000000000..aa2d0bbe3
--- /dev/null
+++ b/src/test/java/org/traccar/handler/events/MaintenanceEventHandlerTest.java
@@ -0,0 +1,60 @@
+package org.traccar.handler.events;
+
+import org.junit.Test;
+import org.traccar.BaseTest;
+import org.traccar.model.Maintenance;
+import org.traccar.model.Position;
+import org.traccar.session.cache.CacheManager;
+
+import java.util.Arrays;
+import java.util.Date;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.anyLong;
+
+public class MaintenanceEventHandlerTest extends BaseTest {
+
+ @Test
+ public void testMaintenanceEventHandler() {
+ Position lastPosition = new Position();
+ lastPosition.setDeviceId(1);
+ lastPosition.setFixTime(new Date(0));
+
+ Position position = new Position();
+ position.setDeviceId(1);
+ position.setFixTime(new Date(0));
+
+ var maintenance = mock(Maintenance.class);
+ when(maintenance.getType()).thenReturn(Position.KEY_TOTAL_DISTANCE);
+ var maintenances = Arrays.asList(maintenance);
+
+ var cacheManager = mock(CacheManager.class);
+ when(cacheManager.getDeviceObjects(anyLong(), eq(Maintenance.class))).thenReturn(maintenances);
+ when(cacheManager.getPosition(anyLong())).thenReturn(lastPosition);
+ MaintenanceEventHandler eventHandler = new MaintenanceEventHandler(cacheManager);
+
+ when(maintenance.getStart()).thenReturn(10000.0);
+ when(maintenance.getPeriod()).thenReturn(2000.0);
+
+ lastPosition.set(Position.KEY_TOTAL_DISTANCE, 1999);
+ position.set(Position.KEY_TOTAL_DISTANCE, 2001);
+ assertTrue(eventHandler.analyzePosition(position).isEmpty());
+
+ lastPosition.set(Position.KEY_TOTAL_DISTANCE, 3999);
+ position.set(Position.KEY_TOTAL_DISTANCE, 4001);
+ assertTrue(eventHandler.analyzePosition(position).isEmpty());
+
+ lastPosition.set(Position.KEY_TOTAL_DISTANCE, 9999);
+ position.set(Position.KEY_TOTAL_DISTANCE, 10001);
+ assertTrue(eventHandler.analyzePosition(position).size() == 1);
+
+ lastPosition.set(Position.KEY_TOTAL_DISTANCE, 11999);
+ position.set(Position.KEY_TOTAL_DISTANCE, 12001);
+ assertTrue(eventHandler.analyzePosition(position).size() == 1);
+
+ }
+
+}