Merge branch 'master' into develop

1 files changed, 98 insertions, 64 deletions

diff --git a/src/test/java/org/traccar/reports/ReportUtilsTest.java b/src/test/java/org/traccar/reports/ReportUtilsTest.java
index deb17ddd2..4bf668064 100644
--- a/src/test/java/org/traccar/reports/ReportUtilsTest.java
+++ b/src/test/java/org/traccar/reports/ReportUtilsTest.java
@@ -1,9 +1,20 @@
 package org.traccar.reports;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import org.apache.velocity.app.VelocityEngine;
+import org.junit.Before;
+import org.junit.Test;
+import org.traccar.BaseTest;
+import org.traccar.api.security.PermissionsService;
+import org.traccar.config.Config;
+import org.traccar.helper.model.PositionUtil;
+import org.traccar.model.Device;
+import org.traccar.model.Position;
+import org.traccar.reports.common.ReportUtils;
+import org.traccar.reports.common.TripsConfig;
+import org.traccar.reports.model.StopReportItem;
+import org.traccar.reports.model.TripReportItem;
+import org.traccar.storage.Storage;
+import org.traccar.storage.StorageException;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -15,15 +26,23 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.TimeZone;
 
-import org.junit.Test;
-import org.traccar.BaseTest;
-import org.traccar.TestIdentityManager;
-import org.traccar.model.Position;
-import org.traccar.reports.model.StopReport;
-import org.traccar.reports.model.TripReport;
-import org.traccar.reports.model.TripsConfig;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class ReportUtilsTest extends BaseTest {
+    
+    private Storage storage;
+    
+    @Before
+    public void init() throws StorageException {
+        storage = mock(Storage.class);
+        when(storage.getObject(any(), any())).thenReturn(mock(Device.class));
+    }
 
     private Date date(String time) throws ParseException {
         DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
@@ -38,35 +57,39 @@ public class ReportUtilsTest extends BaseTest {
         position.setTime(date(time));
         position.setValid(true);
         position.setSpeed(speed);
+        position.set(Position.KEY_MOTION, speed > 0);
         position.set(Position.KEY_TOTAL_DISTANCE, totalDistance);
 
         return position;
     }
-
+    
     @Test
     public void testCalculateDistance() {
         Position startPosition = new Position();
         startPosition.set(Position.KEY_TOTAL_DISTANCE, 500.0);
         Position endPosition = new Position();
         endPosition.set(Position.KEY_TOTAL_DISTANCE, 700.0);
-        assertEquals(ReportUtils.calculateDistance(startPosition, endPosition), 200.0, 10);
+        assertEquals(PositionUtil.calculateDistance(startPosition, endPosition, true), 200.0, 10);
         startPosition.set(Position.KEY_ODOMETER, 50000);
         endPosition.set(Position.KEY_ODOMETER, 51000);
-        assertEquals(ReportUtils.calculateDistance(startPosition, endPosition), 1000.0, 10);
+        assertEquals(PositionUtil.calculateDistance(startPosition, endPosition, true), 1000.0, 10);
     }
 
     @Test
     public void testCalculateSpentFuel() {
+        ReportUtils reportUtils = new ReportUtils(
+                mock(Config.class), storage, mock(PermissionsService.class),
+                mock(TripsConfig.class), mock(VelocityEngine.class), null);
         Position startPosition = new Position();
         Position endPosition = new Position();
-        assertEquals(ReportUtils.calculateFuel(startPosition, endPosition), 0.0, 0.01);
+        assertEquals(reportUtils.calculateFuel(startPosition, endPosition), 0.0, 0.01);
         startPosition.set(Position.KEY_FUEL_LEVEL, 0.7);
         endPosition.set(Position.KEY_FUEL_LEVEL, 0.5);
-        assertEquals(ReportUtils.calculateFuel(startPosition, endPosition), 0.2, 0.01);
+        assertEquals(reportUtils.calculateFuel(startPosition, endPosition), 0.2, 0.01);
     }
 
     @Test
-    public void testDetectTripsSimple() throws ParseException {
+    public void testDetectTripsSimple() throws Exception {
 
         List<Position> data = Arrays.asList(
                 position("2016-01-01 00:00:00.000", 0, 0),
@@ -79,14 +102,16 @@ public class ReportUtilsTest extends BaseTest {
                 position("2016-01-01 00:07:00.000", 0, 3000));
 
         TripsConfig tripsConfig = new TripsConfig(500, 300000, 180000, 900000, false, false, 0.01);
+        ReportUtils reportUtils = new ReportUtils(
+                mock(Config.class), storage, mock(PermissionsService.class),
+                tripsConfig, mock(VelocityEngine.class), null);
 
-        Collection<TripReport> trips = ReportUtils.detectTripsAndStops(
-                new TestIdentityManager(), null, data, tripsConfig, false, TripReport.class);
+        var trips = reportUtils.detectTripsAndStops(mock(Device.class), data, false, TripReportItem.class);
 
         assertNotNull(trips);
         assertFalse(trips.isEmpty());
 
-        TripReport itemTrip = trips.iterator().next();
+        TripReportItem itemTrip = trips.iterator().next();
 
         assertEquals(date("2016-01-01 00:02:00.000"), itemTrip.getStartTime());
         assertEquals(date("2016-01-01 00:05:00.000"), itemTrip.getEndTime());
@@ -95,15 +120,14 @@ public class ReportUtilsTest extends BaseTest {
         assertEquals(10, itemTrip.getMaxSpeed(), 0.01);
         assertEquals(3000, itemTrip.getDistance(), 0.01);
 
-        Collection<StopReport> stops = ReportUtils.detectTripsAndStops(
-                new TestIdentityManager(), null, data, tripsConfig, false, StopReport.class);
+        var stops = reportUtils.detectTripsAndStops(mock(Device.class) ,data, false, StopReportItem.class);
 
         assertNotNull(stops);
         assertFalse(stops.isEmpty());
 
-        Iterator<StopReport> iterator = stops.iterator();
+        Iterator<StopReportItem> iterator = stops.iterator();
 
-        StopReport itemStop = iterator.next();
+        StopReportItem itemStop = iterator.next();
 
         assertEquals(date("2016-01-01 00:00:00.000"), itemStop.getStartTime());
         assertEquals(date("2016-01-01 00:02:00.000"), itemStop.getEndTime());
@@ -118,7 +142,7 @@ public class ReportUtilsTest extends BaseTest {
     }
 
     @Test
-    public void testDetectTripsSimpleWithIgnition() throws ParseException {
+    public void testDetectTripsSimpleWithIgnition() throws Exception {
 
         List<Position> data = Arrays.asList(
                 position("2016-01-01 00:00:00.000", 0, 0),
@@ -133,14 +157,16 @@ public class ReportUtilsTest extends BaseTest {
         data.get(5).set(Position.KEY_IGNITION, false);
 
         TripsConfig tripsConfig = new TripsConfig(500, 300000, 180000, 900000, true, false, 0.01);
+        ReportUtils reportUtils = new ReportUtils(
+                mock(Config.class), storage, mock(PermissionsService.class),
+                tripsConfig, mock(VelocityEngine.class), null);
 
-        Collection<TripReport> trips = ReportUtils.detectTripsAndStops(
-                new TestIdentityManager(), null, data, tripsConfig, false, TripReport.class);
+        var trips = reportUtils.detectTripsAndStops(mock(Device.class) ,data, false, TripReportItem.class);
 
         assertNotNull(trips);
         assertFalse(trips.isEmpty());
 
-        TripReport itemTrip = trips.iterator().next();
+        TripReportItem itemTrip = trips.iterator().next();
 
         assertEquals(date("2016-01-01 00:02:00.000"), itemTrip.getStartTime());
         assertEquals(date("2016-01-01 00:05:00.000"), itemTrip.getEndTime());
@@ -149,8 +175,7 @@ public class ReportUtilsTest extends BaseTest {
         assertEquals(10, itemTrip.getMaxSpeed(), 0.01);
         assertEquals(3000, itemTrip.getDistance(), 0.01);
 
-        trips = ReportUtils.detectTripsAndStops(
-                new TestIdentityManager(), null, data, tripsConfig, false, TripReport.class);
+        trips = reportUtils.detectTripsAndStops(mock(Device.class) ,data, false, TripReportItem.class);
 
         assertNotNull(trips);
         assertFalse(trips.isEmpty());
@@ -164,15 +189,14 @@ public class ReportUtilsTest extends BaseTest {
         assertEquals(10, itemTrip.getMaxSpeed(), 0.01);
         assertEquals(3000, itemTrip.getDistance(), 0.01);
 
-        Collection<StopReport> stops = ReportUtils.detectTripsAndStops(
-                new TestIdentityManager(), null, data, tripsConfig, false, StopReport.class);
+        var stops = reportUtils.detectTripsAndStops(mock(Device.class) ,data, false, StopReportItem.class);
 
         assertNotNull(stops);
         assertFalse(stops.isEmpty());
 
-        Iterator<StopReport> iterator = stops.iterator();
+        Iterator<StopReportItem> iterator = stops.iterator();
 
-        StopReport itemStop = iterator.next();
+        StopReportItem itemStop = iterator.next();
 
         assertEquals(date("2016-01-01 00:00:00.000"), itemStop.getStartTime());
         assertEquals(date("2016-01-01 00:02:00.000"), itemStop.getEndTime());
@@ -187,7 +211,7 @@ public class ReportUtilsTest extends BaseTest {
     }
 
     @Test
-    public void testDetectTripsWithFluctuation() throws ParseException {
+    public void testDetectTripsWithFluctuation() throws Exception {
 
         List<Position> data = Arrays.asList(
                 position("2016-01-01 00:00:00.000", 0, 0),
@@ -204,14 +228,16 @@ public class ReportUtilsTest extends BaseTest {
                 position("2016-01-01 00:11:00.000", 0, 7000));
 
         TripsConfig tripsConfig = new TripsConfig(500, 300000, 180000, 900000, false, false, 0.01);
+        ReportUtils reportUtils = new ReportUtils(
+                mock(Config.class), storage, mock(PermissionsService.class),
+                tripsConfig, mock(VelocityEngine.class), null);
 
-        Collection<TripReport> trips = ReportUtils.detectTripsAndStops(
-                new TestIdentityManager(), null, data, tripsConfig, false, TripReport.class);
+        var trips = reportUtils.detectTripsAndStops(mock(Device.class) ,data, false, TripReportItem.class);
 
         assertNotNull(trips);
         assertFalse(trips.isEmpty());
 
-        TripReport itemTrip = trips.iterator().next();
+        TripReportItem itemTrip = trips.iterator().next();
 
         assertEquals(date("2016-01-01 00:02:00.000"), itemTrip.getStartTime());
         assertEquals(date("2016-01-01 00:09:00.000"), itemTrip.getEndTime());
@@ -220,15 +246,14 @@ public class ReportUtilsTest extends BaseTest {
         assertEquals(10, itemTrip.getMaxSpeed(), 0.01);
         assertEquals(7000, itemTrip.getDistance(), 0.01);
 
-        Collection<StopReport> stops = ReportUtils.detectTripsAndStops(
-                new TestIdentityManager(), null, data, tripsConfig, false, StopReport.class);
+        var stops = reportUtils.detectTripsAndStops(mock(Device.class) ,data, false, StopReportItem.class);
 
         assertNotNull(stops);
         assertFalse(stops.isEmpty());
 
-        Iterator<StopReport> iterator = stops.iterator();
+        Iterator<StopReportItem> iterator = stops.iterator();
 
-        StopReport itemStop = iterator.next();
+        StopReportItem itemStop = iterator.next();
 
         assertEquals(date("2016-01-01 00:00:00.000"), itemStop.getStartTime());
         assertEquals(date("2016-01-01 00:02:00.000"), itemStop.getEndTime());
@@ -243,7 +268,7 @@ public class ReportUtilsTest extends BaseTest {
     }
 
     @Test
-    public void testDetectStopsOnly() throws ParseException {
+    public void testDetectStopsOnly() throws Exception {
 
         Collection<Position> data = Arrays.asList(
                 position("2016-01-01 00:00:00.000", 0, 0),
@@ -254,14 +279,16 @@ public class ReportUtilsTest extends BaseTest {
                 position("2016-01-01 00:05:00.000", 0, 0));
 
         TripsConfig tripsConfig = new TripsConfig(500, 300000, 200000, 900000, false, false, 0.01);
+        ReportUtils reportUtils = new ReportUtils(
+                mock(Config.class), storage, mock(PermissionsService.class),
+                tripsConfig, mock(VelocityEngine.class), null);
 
-        Collection<StopReport> result = ReportUtils.detectTripsAndStops(
-                new TestIdentityManager(), null, data, tripsConfig, false, StopReport.class);
+        var result = reportUtils.detectTripsAndStops(mock(Device.class) ,data, false, StopReportItem.class);
 
         assertNotNull(result);
         assertFalse(result.isEmpty());
 
-        StopReport itemStop = result.iterator().next();
+        StopReportItem itemStop = result.iterator().next();
 
         assertEquals(date("2016-01-01 00:00:00.000"), itemStop.getStartTime());
         assertEquals(date("2016-01-01 00:05:00.000"), itemStop.getEndTime());
@@ -270,7 +297,7 @@ public class ReportUtilsTest extends BaseTest {
     }
 
     @Test
-    public void testDetectStopsWithTripCut() throws ParseException {
+    public void testDetectStopsWithTripCut() throws Exception {
 
         Collection<Position> data = Arrays.asList(
                 position("2016-01-01 00:00:00.000", 0, 0),
@@ -281,14 +308,16 @@ public class ReportUtilsTest extends BaseTest {
                 position("2016-01-01 00:05:00.000", 2, 0));
 
         TripsConfig tripsConfig = new TripsConfig(500, 300000, 200000, 900000, false, false, 0.01);
+        ReportUtils reportUtils = new ReportUtils(
+                mock(Config.class), storage, mock(PermissionsService.class),
+                tripsConfig, mock(VelocityEngine.class), null);
 
-        Collection<StopReport> result = ReportUtils.detectTripsAndStops(
-                new TestIdentityManager(), null, data, tripsConfig, false, StopReport.class);
+        var result = reportUtils.detectTripsAndStops(mock(Device.class) ,data, false, StopReportItem.class);
 
         assertNotNull(result);
         assertFalse(result.isEmpty());
 
-        StopReport itemStop = result.iterator().next();
+        StopReportItem itemStop = result.iterator().next();
 
         assertEquals(date("2016-01-01 00:00:00.000"), itemStop.getStartTime());
         assertEquals(date("2016-01-01 00:04:00.000"), itemStop.getEndTime());
@@ -297,7 +326,7 @@ public class ReportUtilsTest extends BaseTest {
     }
 
     @Test
-    public void testDetectStopsStartedFromTrip() throws ParseException {
+    public void testDetectStopsStartedFromTrip() throws Exception {
 
         Collection<Position> data = Arrays.asList(
                 position("2016-01-01 00:00:00.000", 2, 0),
@@ -308,14 +337,16 @@ public class ReportUtilsTest extends BaseTest {
                 position("2016-01-01 00:05:00.000", 0, 0));
 
         TripsConfig tripsConfig = new TripsConfig(500, 300000, 200000, 900000, false, false, 0.01);
+        ReportUtils reportUtils = new ReportUtils(
+                mock(Config.class), storage, mock(PermissionsService.class),
+                tripsConfig, mock(VelocityEngine.class), null);
 
-        Collection<StopReport> result = ReportUtils.detectTripsAndStops(
-                new TestIdentityManager(), null, data, tripsConfig, false, StopReport.class);
+        var result = reportUtils.detectTripsAndStops(mock(Device.class) ,data, false, StopReportItem.class);
 
         assertNotNull(result);
         assertFalse(result.isEmpty());
 
-        StopReport itemStop = result.iterator().next();
+        StopReportItem itemStop = result.iterator().next();
 
         assertEquals(date("2016-01-01 00:02:00.000"), itemStop.getStartTime());
         assertEquals(date("2016-01-01 00:05:00.000"), itemStop.getEndTime());
@@ -324,7 +355,7 @@ public class ReportUtilsTest extends BaseTest {
     }
 
     @Test
-    public void testDetectStopsMoving() throws ParseException {
+    public void testDetectStopsMoving() throws Exception {
 
         Collection<Position> data = Arrays.asList(
                 position("2016-01-01 00:00:00.000", 5, 0),
@@ -335,9 +366,11 @@ public class ReportUtilsTest extends BaseTest {
                 position("2016-01-01 00:05:00.000", 5, 0));
 
         TripsConfig tripsConfig = new TripsConfig(500, 300000, 200000, 900000, false, false, 0.01);
+        ReportUtils reportUtils = new ReportUtils(
+                mock(Config.class), storage, mock(PermissionsService.class),
+                tripsConfig, mock(VelocityEngine.class), null);
 
-        Collection<StopReport> result = ReportUtils.detectTripsAndStops(
-                new TestIdentityManager(), null, data, tripsConfig, false, StopReport.class);
+        var result = reportUtils.detectTripsAndStops(mock(Device.class) ,data, false, StopReportItem.class);
 
         assertNotNull(result);
         assertTrue(result.isEmpty());
@@ -345,7 +378,7 @@ public class ReportUtilsTest extends BaseTest {
     }
 
     @Test
-    public void testDetectTripAndStopByGap() throws ParseException {
+    public void testDetectTripAndStopByGap() throws Exception {
 
         Collection<Position> data = Arrays.asList(
                 position("2016-01-01 00:00:00.000", 7, 100),
@@ -358,14 +391,16 @@ public class ReportUtilsTest extends BaseTest {
                 position("2016-01-01 00:25:00.000", 5, 900));
 
         TripsConfig tripsConfig = new TripsConfig(500, 200000, 200000, 900000, false, false, 0.01);
+        ReportUtils reportUtils = new ReportUtils(
+                mock(Config.class), storage, mock(PermissionsService.class),
+                tripsConfig, mock(VelocityEngine.class), null);
 
-        Collection<TripReport> trips = ReportUtils.detectTripsAndStops(
-                new TestIdentityManager(), null, data, tripsConfig, false, TripReport.class);
+        var trips = reportUtils.detectTripsAndStops(mock(Device.class) ,data, false, TripReportItem.class);
 
         assertNotNull(trips);
         assertFalse(trips.isEmpty());
 
-        TripReport itemTrip = trips.iterator().next();
+        TripReportItem itemTrip = trips.iterator().next();
 
         assertEquals(date("2016-01-01 00:00:00.000"), itemTrip.getStartTime());
         assertEquals(date("2016-01-01 00:04:00.000"), itemTrip.getEndTime());
@@ -374,13 +409,12 @@ public class ReportUtilsTest extends BaseTest {
         assertEquals(7, itemTrip.getMaxSpeed(), 0.01);
         assertEquals(600, itemTrip.getDistance(), 0.01);
 
-        Collection<StopReport> stops = ReportUtils.detectTripsAndStops(
-                new TestIdentityManager(), null, data, tripsConfig, false, StopReport.class);
+        var stops = reportUtils.detectTripsAndStops(mock(Device.class) ,data, false, StopReportItem.class);
 
         assertNotNull(stops);
         assertFalse(stops.isEmpty());
 
-        StopReport itemStop = stops.iterator().next();
+        StopReportItem itemStop = stops.iterator().next();
 
         assertEquals(date("2016-01-01 00:04:00.000"), itemStop.getStartTime());
         assertEquals(date("2016-01-01 00:24:00.000"), itemStop.getEndTime());