aboutsummaryrefslogtreecommitdiff
path: root/src/test/java/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2022-06-18 10:00:52 -0700
committerAnton Tananaev <anton@traccar.org>2022-06-18 10:00:52 -0700
commitc248ed30047a0525bf792730a0fbd4de0c89ad8e (patch)
tree750adc33654a4f8947e09528cfb85534cfceb8f1 /src/test/java/org
parent68826cdc767bae6b8b39e88667372f0c6161efa9 (diff)
downloadtrackermap-server-c248ed30047a0525bf792730a0fbd4de0c89ad8e.tar.gz
trackermap-server-c248ed30047a0525bf792730a0fbd4de0c89ad8e.tar.bz2
trackermap-server-c248ed30047a0525bf792730a0fbd4de0c89ad8e.zip
Refactor attribute lookup
Diffstat (limited to 'src/test/java/org')
-rw-r--r--src/test/java/org/traccar/BaseTest.java15
-rw-r--r--src/test/java/org/traccar/handler/FilterHandlerTest.java21
-rw-r--r--src/test/java/org/traccar/handler/events/OverspeedEventHandlerTest.java2
3 files changed, 20 insertions, 18 deletions
diff --git a/src/test/java/org/traccar/BaseTest.java b/src/test/java/org/traccar/BaseTest.java
index 1652a6694..add423cdd 100644
--- a/src/test/java/org/traccar/BaseTest.java
+++ b/src/test/java/org/traccar/BaseTest.java
@@ -9,6 +9,7 @@ import org.traccar.database.StatisticsManager;
import org.traccar.model.Device;
import org.traccar.session.ConnectionManager;
import org.traccar.session.DeviceSession;
+import org.traccar.session.cache.CacheManager;
import java.net.SocketAddress;
import java.util.HashSet;
@@ -16,6 +17,7 @@ import java.util.HashSet;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -23,19 +25,18 @@ import static org.mockito.Mockito.when;
public class BaseTest {
protected <T extends BaseProtocolDecoder> T inject(T decoder) throws Exception {
- decoder.setConfig(new Config());
+ var config = new Config();
+ decoder.setConfig(config);
var device = mock(Device.class);
when(device.getId()).thenReturn(1L);
var identityManager = mock(IdentityManager.class);
when(identityManager.getById(anyLong())).thenReturn(device);
when(identityManager.getByUniqueId(any())).thenReturn(device);
- when(identityManager.lookupAttributeBoolean(anyLong(), any(), anyBoolean(), anyBoolean(), anyBoolean()))
- .thenAnswer(invocation -> invocation.getArguments()[2]);
- when(identityManager.lookupAttributeString(anyLong(), any(), any(), anyBoolean(), anyBoolean()))
- .thenAnswer(invocation -> invocation.getArguments()[2]);
- when(identityManager.lookupAttributeInteger(anyLong(), any(), anyInt(), anyBoolean(), anyBoolean()))
- .thenAnswer(invocation -> invocation.getArguments()[2]);
decoder.setIdentityManager(identityManager);
+ var cacheManager = mock(CacheManager.class);
+ when(cacheManager.getConfig()).thenReturn(config);
+ when(cacheManager.getObject(eq(Device.class), anyLong())).thenReturn(device);
+ decoder.setCacheManager(cacheManager);
var connectionManager = mock(ConnectionManager.class);
var uniqueIdsProvided = new HashSet<Boolean>();
when(connectionManager.getDeviceSession(any(), any(), any(), any())).thenAnswer(invocation -> {
diff --git a/src/test/java/org/traccar/handler/FilterHandlerTest.java b/src/test/java/org/traccar/handler/FilterHandlerTest.java
index 10d6768cf..a1102da88 100644
--- a/src/test/java/org/traccar/handler/FilterHandlerTest.java
+++ b/src/test/java/org/traccar/handler/FilterHandlerTest.java
@@ -5,15 +5,16 @@ 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 org.traccar.session.cache.CacheManager;
import java.util.Date;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -26,9 +27,9 @@ public class FilterHandlerTest extends BaseTest {
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);
+ var cacheManager = mock(CacheManager.class);
+ when(cacheManager.getConfig()).thenReturn(config);
+ passingHandler = new FilterHandler(config, cacheManager, null);
}
@Before
@@ -45,11 +46,11 @@ public class FilterHandlerTest extends BaseTest {
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);
+ when(config.getString(Keys.FILTER_SKIP_ATTRIBUTES.getKey())).thenReturn("alarm,result");
+ var cacheManager = mock(CacheManager.class);
+ when(cacheManager.getConfig()).thenReturn(config);
+ when(cacheManager.getObject(any(), anyLong())).thenReturn(mock(Device.class));
+ filteringHandler = new FilterHandler(config, cacheManager, null);
}
private Position createPosition(Date time, boolean valid, double speed) {
diff --git a/src/test/java/org/traccar/handler/events/OverspeedEventHandlerTest.java b/src/test/java/org/traccar/handler/events/OverspeedEventHandlerTest.java
index 9e86031e8..46e142935 100644
--- a/src/test/java/org/traccar/handler/events/OverspeedEventHandlerTest.java
+++ b/src/test/java/org/traccar/handler/events/OverspeedEventHandlerTest.java
@@ -61,7 +61,7 @@ public class OverspeedEventHandlerTest extends BaseTest {
Event event = events.keySet().iterator().next();
assertEquals(Event.TYPE_DEVICE_OVERSPEED, event.getType());
assertEquals(50, event.getDouble("speed"), 0.1);
- assertEquals(40, event.getDouble(OverspeedEventHandler.ATTRIBUTE_SPEED_LIMIT), 0.1);
+ assertEquals(40, event.getDouble("speedLimit"), 0.1);
assertEquals(geofenceId, event.getGeofenceId());
assertEquals(notRepeat, deviceState.getOverspeedState());