Refactor position and event handlers

1 files changed, 7 insertions, 3 deletions

diff --git a/src/test/java/org/traccar/handler/events/CommandResultEventHandlerTest.java b/src/test/java/org/traccar/handler/events/CommandResultEventHandlerTest.java
index bc24e42f5..58e198b7f 100644
--- a/src/test/java/org/traccar/handler/events/CommandResultEventHandlerTest.java
+++ b/src/test/java/org/traccar/handler/events/CommandResultEventHandlerTest.java
@@ -5,9 +5,12 @@ import org.traccar.BaseTest;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class CommandResultEventHandlerTest extends BaseTest {
@@ -19,9 +22,10 @@ public class CommandResultEventHandlerTest extends BaseTest {
         
         Position position = new Position();
         position.set(Position.KEY_RESULT, "Test Result");
-        Map<Event, Position> events = commandResultEventHandler.analyzePosition(position);
-        assertNotNull(events);
-        Event event = events.keySet().iterator().next();
+        List<Event> events = new ArrayList<>();
+        commandResultEventHandler.analyzePosition(position, events::add);
+        assertFalse(events.isEmpty());
+        Event event = events.iterator().next();
         assertEquals(Event.TYPE_COMMAND_RESULT, event.getType());
     }