Inject velocity engine

1 files changed, 19 insertions, 18 deletions

diff --git a/src/test/java/org/traccar/reports/ReportUtilsTest.java b/src/test/java/org/traccar/reports/ReportUtilsTest.java
index 92bfdae1c..1440c4c30 100644
--- a/src/test/java/org/traccar/reports/ReportUtilsTest.java
+++ b/src/test/java/org/traccar/reports/ReportUtilsTest.java
@@ -1,5 +1,6 @@
 package org.traccar.reports;
 
+import org.apache.velocity.app.VelocityEngine;
 import org.junit.Test;
 import org.traccar.BaseTest;
 import org.traccar.api.security.PermissionsService;
@@ -76,8 +77,8 @@ public class ReportUtilsTest extends BaseTest {
     @Test
     public void testCalculateSpentFuel() {
         ReportUtils reportUtils = new ReportUtils(
-                mock(Config.class), mock(Storage.class), mock(PermissionsService.class),
-                mockIdentityManager(), mock(DeviceManager.class), mock(TripsConfig.class), null);
+                mock(Config.class), mock(Storage.class), mock(PermissionsService.class), mockIdentityManager(),
+                mock(DeviceManager.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);
@@ -101,8 +102,8 @@ public class ReportUtilsTest extends BaseTest {
 
         TripsConfig tripsConfig = new TripsConfig(500, 300000, 180000, 900000, false, false, 0.01);
         ReportUtils reportUtils = new ReportUtils(
-                mock(Config.class), mock(Storage.class), mock(PermissionsService.class),
-                mockIdentityManager(), mock(DeviceManager.class), tripsConfig, null);
+                mock(Config.class), mock(Storage.class), mock(PermissionsService.class), mockIdentityManager(),
+                mock(DeviceManager.class), tripsConfig, mock(VelocityEngine.class), null);
 
         Collection<TripReportItem> trips = reportUtils.detectTripsAndStops(data, false, TripReportItem.class);
 
@@ -156,8 +157,8 @@ public class ReportUtilsTest extends BaseTest {
 
         TripsConfig tripsConfig = new TripsConfig(500, 300000, 180000, 900000, true, false, 0.01);
         ReportUtils reportUtils = new ReportUtils(
-                mock(Config.class), mock(Storage.class), mock(PermissionsService.class),
-                mockIdentityManager(), mock(DeviceManager.class), tripsConfig, null);
+                mock(Config.class), mock(Storage.class), mock(PermissionsService.class), mockIdentityManager(),
+                mock(DeviceManager.class), tripsConfig, mock(VelocityEngine.class), null);
 
         Collection<TripReportItem> trips = reportUtils.detectTripsAndStops(data, false, TripReportItem.class);
 
@@ -227,8 +228,8 @@ public class ReportUtilsTest extends BaseTest {
 
         TripsConfig tripsConfig = new TripsConfig(500, 300000, 180000, 900000, false, false, 0.01);
         ReportUtils reportUtils = new ReportUtils(
-                mock(Config.class), mock(Storage.class), mock(PermissionsService.class),
-                mockIdentityManager(), mock(DeviceManager.class), tripsConfig, null);
+                mock(Config.class), mock(Storage.class), mock(PermissionsService.class), mockIdentityManager(),
+                mock(DeviceManager.class), tripsConfig, mock(VelocityEngine.class), null);
 
         Collection<TripReportItem> trips = reportUtils.detectTripsAndStops(data, false, TripReportItem.class);
 
@@ -278,8 +279,8 @@ public class ReportUtilsTest extends BaseTest {
 
         TripsConfig tripsConfig = new TripsConfig(500, 300000, 200000, 900000, false, false, 0.01);
         ReportUtils reportUtils = new ReportUtils(
-                mock(Config.class), mock(Storage.class), mock(PermissionsService.class),
-                mockIdentityManager(), mock(DeviceManager.class), tripsConfig, null);
+                mock(Config.class), mock(Storage.class), mock(PermissionsService.class), mockIdentityManager(),
+                mock(DeviceManager.class), tripsConfig, mock(VelocityEngine.class), null);
 
         Collection<StopReportItem> result = reportUtils.detectTripsAndStops(data, false, StopReportItem.class);
 
@@ -307,8 +308,8 @@ public class ReportUtilsTest extends BaseTest {
 
         TripsConfig tripsConfig = new TripsConfig(500, 300000, 200000, 900000, false, false, 0.01);
         ReportUtils reportUtils = new ReportUtils(
-                mock(Config.class), mock(Storage.class), mock(PermissionsService.class),
-                mockIdentityManager(), mock(DeviceManager.class), tripsConfig, null);
+                mock(Config.class), mock(Storage.class), mock(PermissionsService.class), mockIdentityManager(),
+                mock(DeviceManager.class), tripsConfig, mock(VelocityEngine.class), null);
 
         Collection<StopReportItem> result = reportUtils.detectTripsAndStops(data, false, StopReportItem.class);
 
@@ -336,8 +337,8 @@ public class ReportUtilsTest extends BaseTest {
 
         TripsConfig tripsConfig = new TripsConfig(500, 300000, 200000, 900000, false, false, 0.01);
         ReportUtils reportUtils = new ReportUtils(
-                mock(Config.class), mock(Storage.class), mock(PermissionsService.class),
-                mockIdentityManager(), mock(DeviceManager.class), tripsConfig, null);
+                mock(Config.class), mock(Storage.class), mock(PermissionsService.class), mockIdentityManager(),
+                mock(DeviceManager.class), tripsConfig, mock(VelocityEngine.class), null);
 
         Collection<StopReportItem> result = reportUtils.detectTripsAndStops(data, false, StopReportItem.class);
 
@@ -365,8 +366,8 @@ public class ReportUtilsTest extends BaseTest {
 
         TripsConfig tripsConfig = new TripsConfig(500, 300000, 200000, 900000, false, false, 0.01);
         ReportUtils reportUtils = new ReportUtils(
-                mock(Config.class), mock(Storage.class), mock(PermissionsService.class),
-                mockIdentityManager(), mock(DeviceManager.class), tripsConfig, null);
+                mock(Config.class), mock(Storage.class), mock(PermissionsService.class), mockIdentityManager(),
+                mock(DeviceManager.class), tripsConfig, mock(VelocityEngine.class), null);
 
         Collection<StopReportItem> result = reportUtils.detectTripsAndStops(data, false, StopReportItem.class);
 
@@ -390,8 +391,8 @@ public class ReportUtilsTest extends BaseTest {
 
         TripsConfig tripsConfig = new TripsConfig(500, 200000, 200000, 900000, false, false, 0.01);
         ReportUtils reportUtils = new ReportUtils(
-                mock(Config.class), mock(Storage.class), mock(PermissionsService.class),
-                mockIdentityManager(), mock(DeviceManager.class), tripsConfig, null);
+                mock(Config.class), mock(Storage.class), mock(PermissionsService.class), mockIdentityManager(),
+                mock(DeviceManager.class), tripsConfig, mock(VelocityEngine.class), null);
 
         Collection<TripReportItem> trips = reportUtils.detectTripsAndStops(data, false, TripReportItem.class);