From 5877cb1b3f1fa7331c4310b9754a3ec442586497 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Sun, 13 Nov 2022 11:48:43 -0800
Subject: Refactor position forwarding

---
 src/test/java/org/traccar/WebDataHandlerTest.java  | 42 ----------------------
 .../traccar/forward/PositionForwarderUrlTest.java  | 42 ++++++++++++++++++++++
 2 files changed, 42 insertions(+), 42 deletions(-)
 delete mode 100644 src/test/java/org/traccar/WebDataHandlerTest.java
 create mode 100644 src/test/java/org/traccar/forward/PositionForwarderUrlTest.java

(limited to 'src/test/java/org')

diff --git a/src/test/java/org/traccar/WebDataHandlerTest.java b/src/test/java/org/traccar/WebDataHandlerTest.java
deleted file mode 100644
index 99dbb83fa..000000000
--- a/src/test/java/org/traccar/WebDataHandlerTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.traccar;
-
-import org.junit.Test;
-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 {
-
-    @Test
-    public void testFormatRequest() throws Exception {
-
-        Config config = new Config();
-        config.setString(Keys.FORWARD_URL, "http://localhost/?fixTime={fixTime}&gprmc={gprmc}&name={name}");
-
-        Position position = position("2016-01-01 01:02:03.000", true, 20, 30);
-
-        var device = mock(Device.class);
-        when(device.getId()).thenReturn(1L);
-        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);
-
-        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));
-
-    }
-
-}
diff --git a/src/test/java/org/traccar/forward/PositionForwarderUrlTest.java b/src/test/java/org/traccar/forward/PositionForwarderUrlTest.java
new file mode 100644
index 000000000..522958052
--- /dev/null
+++ b/src/test/java/org/traccar/forward/PositionForwarderUrlTest.java
@@ -0,0 +1,42 @@
+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 static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class PositionForwarderUrlTest extends ProtocolTest {
+
+    @Test
+    public void testFormatRequest() throws Exception {
+
+        Config config = new Config();
+        config.setString(Keys.FORWARD_URL, "http://localhost/?fixTime={fixTime}&gprmc={gprmc}&name={name}");
+
+        Position position = position("2016-01-01 01:02:03.000", true, 20, 30);
+
+        var device = mock(Device.class);
+        when(device.getId()).thenReturn(1L);
+        when(device.getName()).thenReturn("test");
+        when(device.getUniqueId()).thenReturn("123456789012345");
+        when(device.getStatus()).thenReturn(Device.STATUS_ONLINE);
+
+        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",
+                forwarder.formatRequest(positionData));
+
+    }
+
+}
-- 
cgit v1.2.3