aboutsummaryrefslogtreecommitdiff
path: root/src/test/java/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2022-11-13 11:48:43 -0800
committerAnton Tananaev <anton@traccar.org>2022-11-13 11:48:43 -0800
commit5877cb1b3f1fa7331c4310b9754a3ec442586497 (patch)
tree6cc3e7193412aa152c1b593bf0ad7e4119687a1e /src/test/java/org
parentff793b2e2872f8ba076e748fab41d944f92b64d4 (diff)
downloadtrackermap-server-5877cb1b3f1fa7331c4310b9754a3ec442586497.tar.gz
trackermap-server-5877cb1b3f1fa7331c4310b9754a3ec442586497.tar.bz2
trackermap-server-5877cb1b3f1fa7331c4310b9754a3ec442586497.zip
Refactor position forwarding
Diffstat (limited to 'src/test/java/org')
-rw-r--r--src/test/java/org/traccar/forward/PositionForwarderUrlTest.java (renamed from src/test/java/org/traccar/WebDataHandlerTest.java)18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/test/java/org/traccar/WebDataHandlerTest.java b/src/test/java/org/traccar/forward/PositionForwarderUrlTest.java
index 99dbb83fa..522958052 100644
--- a/src/test/java/org/traccar/WebDataHandlerTest.java
+++ b/src/test/java/org/traccar/forward/PositionForwarderUrlTest.java
@@ -1,19 +1,17 @@
-package org.traccar;
+package org.traccar.forward;
import org.junit.Test;
+import org.traccar.ProtocolTest;
import org.traccar.config.Config;
import org.traccar.config.Keys;
import org.traccar.model.Device;
import org.traccar.model.Position;
-import org.traccar.session.cache.CacheManager;
import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public class WebDataHandlerTest extends ProtocolTest {
+public class PositionForwarderUrlTest extends ProtocolTest {
@Test
public void testFormatRequest() throws Exception {
@@ -28,14 +26,16 @@ public class WebDataHandlerTest extends ProtocolTest {
when(device.getName()).thenReturn("test");
when(device.getUniqueId()).thenReturn("123456789012345");
when(device.getStatus()).thenReturn(Device.STATUS_ONLINE);
- var cacheManager = mock(CacheManager.class);
- when(cacheManager.getObject(eq(Device.class), anyLong())).thenReturn(device);
- WebDataHandler handler = new WebDataHandler(config, cacheManager, null, null, null);
+ PositionData positionData = new PositionData();
+ positionData.setPosition(position);
+ positionData.setDevice(device);
+
+ PositionForwarderUrl forwarder = new PositionForwarderUrl(config, null, null);
assertEquals(
"http://localhost/?fixTime=1451610123000&gprmc=$GPRMC,010203.000,A,2000.0000,N,03000.0000,E,0.00,0.00,010116,,*05&name=test",
- handler.formatRequest(position));
+ forwarder.formatRequest(positionData));
}