aboutsummaryrefslogtreecommitdiff
path: root/src/test/java/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2022-05-30 13:12:37 -0700
committerAnton Tananaev <anton@traccar.org>2022-05-30 13:12:37 -0700
commitce661ec77a957b70c15509c6801e6f34b32ad11d (patch)
tree1fd501abc09e1eeceb3bf411b5d2612b27cc35ad /src/test/java/org/traccar
parent154ff3b2175e67b3fac531cb9c5c5c68880f5e12 (diff)
downloadtrackermap-server-ce661ec77a957b70c15509c6801e6f34b32ad11d.tar.gz
trackermap-server-ce661ec77a957b70c15509c6801e6f34b32ad11d.tar.bz2
trackermap-server-ce661ec77a957b70c15509c6801e6f34b32ad11d.zip
Improve dependency injection
Diffstat (limited to 'src/test/java/org/traccar')
-rw-r--r--src/test/java/org/traccar/TestIdentityManager.java3
-rw-r--r--src/test/java/org/traccar/handler/FilterHandlerTest.java75
-rw-r--r--src/test/java/org/traccar/handler/MotionHandlerTest.java7
3 files changed, 47 insertions, 38 deletions
diff --git a/src/test/java/org/traccar/TestIdentityManager.java b/src/test/java/org/traccar/TestIdentityManager.java
index 7d2865e74..68d98db9a 100644
--- a/src/test/java/org/traccar/TestIdentityManager.java
+++ b/src/test/java/org/traccar/TestIdentityManager.java
@@ -53,9 +53,6 @@ public final class TestIdentityManager implements IdentityManager {
@Override
public String lookupAttributeString(
long deviceId, String attributeName, String defaultValue, boolean lookupServer, boolean lookupConfig) {
- if (attributeName.equals("filter.skipAttributes")) {
- return "alarm,result";
- }
return defaultValue;
}
diff --git a/src/test/java/org/traccar/handler/FilterHandlerTest.java b/src/test/java/org/traccar/handler/FilterHandlerTest.java
index ad8d244a6..49bbf70b5 100644
--- a/src/test/java/org/traccar/handler/FilterHandlerTest.java
+++ b/src/test/java/org/traccar/handler/FilterHandlerTest.java
@@ -5,70 +5,77 @@ import org.junit.Test;
import org.traccar.BaseTest;
import org.traccar.config.Config;
import org.traccar.config.Keys;
+import org.traccar.database.DataManager;
+import org.traccar.database.IdentityManager;
+import org.traccar.model.Device;
import org.traccar.model.Position;
-
import java.util.Date;
-
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import static org.mockito.Mockito.*;
public class FilterHandlerTest extends BaseTest {
- private FilterHandler passingHandler = new FilterHandler(new Config());
+ private FilterHandler passingHandler;
private FilterHandler filteringHandler;
@Before
- public void before() {
- Config config = new Config();
- config.setString(Keys.FILTER_INVALID, String.valueOf(true));
- config.setString(Keys.FILTER_ZERO, String.valueOf(true));
- config.setString(Keys.FILTER_DUPLICATE, String.valueOf(true));
- config.setString(Keys.FILTER_FUTURE, String.valueOf(5 * 60));
- config.setString(Keys.FILTER_APPROXIMATE, String.valueOf(true));
- config.setString(Keys.FILTER_STATIC, String.valueOf(true));
- config.setString(Keys.FILTER_DISTANCE, String.valueOf(10));
- config.setString(Keys.FILTER_MAX_SPEED, String.valueOf(500));
- config.setString(Keys.FILTER_SKIP_LIMIT, String.valueOf(10));
- config.setString(Keys.FILTER_SKIP_ATTRIBUTES_ENABLE, String.valueOf(true));
- filteringHandler = new FilterHandler(config);
+ public void passingHandler() {
+ var config = mock(Config.class);
+ when(config.getBoolean(Keys.FILTER_ENABLE)).thenReturn(true);
+ var identityManager = mock(IdentityManager.class);
+ var dataManager = mock(DataManager.class);
+ passingHandler = new FilterHandler(config, identityManager, dataManager);
}
- private Position createPosition(
- long deviceId,
- Date time,
- boolean valid,
- double latitude,
- double longitude,
- double altitude,
- double speed,
- double course) {
+ @Before
+ public void filteringHandler() {
+ var config = mock(Config.class);
+ when(config.getBoolean(Keys.FILTER_ENABLE)).thenReturn(true);
+ when(config.getBoolean(Keys.FILTER_INVALID)).thenReturn(true);
+ when(config.getBoolean(Keys.FILTER_ZERO)).thenReturn(true);
+ when(config.getBoolean(Keys.FILTER_DUPLICATE)).thenReturn(true);
+ when(config.getLong(Keys.FILTER_FUTURE)).thenReturn(5 * 60L);
+ when(config.getBoolean(Keys.FILTER_APPROXIMATE)).thenReturn(true);
+ when(config.getBoolean(Keys.FILTER_STATIC)).thenReturn(true);
+ when(config.getInteger(Keys.FILTER_DISTANCE)).thenReturn(10);
+ when(config.getInteger(Keys.FILTER_MAX_SPEED)).thenReturn(500);
+ when(config.getLong(Keys.FILTER_SKIP_LIMIT)).thenReturn(10L);
+ when(config.getBoolean(Keys.FILTER_SKIP_ATTRIBUTES_ENABLE)).thenReturn(true);
+ var identityManager = mock(IdentityManager.class);
+ when(identityManager.lookupAttributeString(0, "filter.skipAttributes", "", false, true)).thenReturn("alarm,result");
+ when(identityManager.getById(0)).thenReturn(mock(Device.class));
+ var dataManager = mock(DataManager.class);
+ filteringHandler = new FilterHandler(config, identityManager, dataManager);
+ }
+ private Position createPosition(Date time, boolean valid, double speed) {
Position position = new Position();
- position.setDeviceId(deviceId);
+ position.setDeviceId(0);
position.setTime(time);
position.setValid(valid);
- position.setLatitude(latitude);
- position.setLongitude(longitude);
- position.setAltitude(altitude);
+ position.setLatitude(10);
+ position.setLongitude(10);
+ position.setAltitude(10);
position.setSpeed(speed);
- position.setCourse(course);
+ position.setCourse(10);
return position;
}
@Test
public void testFilter() {
- Position position = createPosition(0, new Date(), true, 10, 10, 10, 10, 10);
+ Position position = createPosition(new Date(), true, 10);
assertNotNull(filteringHandler.handlePosition(position));
assertNotNull(passingHandler.handlePosition(position));
- position = createPosition(0, new Date(Long.MAX_VALUE), true, 10, 10, 10, 10, 10);
+ position = createPosition(new Date(Long.MAX_VALUE), true, 10);
assertNull(filteringHandler.handlePosition(position));
assertNotNull(passingHandler.handlePosition(position));
- position = createPosition(0, new Date(), false, 10, 10, 10, 10, 10);
+ position = createPosition(new Date(), false, 10);
assertNull(filteringHandler.handlePosition(position));
assertNotNull(passingHandler.handlePosition(position));
@@ -78,7 +85,7 @@ public class FilterHandlerTest extends BaseTest {
@Test
public void testSkipAttributes() {
- Position position = createPosition(0, new Date(), true, 10, 10, 10, 0, 10);
+ Position position = createPosition(new Date(), true, 0);
position.set(Position.KEY_ALARM, Position.ALARM_GENERAL);
assertNotNull(filteringHandler.handlePosition(position));
diff --git a/src/test/java/org/traccar/handler/MotionHandlerTest.java b/src/test/java/org/traccar/handler/MotionHandlerTest.java
index 9e0859664..fdbd48334 100644
--- a/src/test/java/org/traccar/handler/MotionHandlerTest.java
+++ b/src/test/java/org/traccar/handler/MotionHandlerTest.java
@@ -1,16 +1,21 @@
package org.traccar.handler;
import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.*;
import org.junit.Test;
import org.traccar.model.Position;
+import org.traccar.reports.model.TripsConfig;
public class MotionHandlerTest {
@Test
public void testCalculateMotion() {
- MotionHandler motionHandler = new MotionHandler(0.01);
+ TripsConfig tripsConfig = mock(TripsConfig.class);
+ when(tripsConfig.getSpeedThreshold()).thenReturn(0.01);
+
+ MotionHandler motionHandler = new MotionHandler(tripsConfig);
Position position = motionHandler.handlePosition(new Position());