From e7a545ee8b6d03ab085896ac162da7ae12e5557d Mon Sep 17 00:00:00 2001 From: Renaud Allard Date: Wed, 19 Oct 2016 15:10:07 +0200 Subject: Log device uniqueId in filters logging This combined with another commit to traccar-web makes it easier to see which device has been filtered. --- test/org/traccar/FilterHandlerTest.java | 38 ++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/org/traccar/FilterHandlerTest.java b/test/org/traccar/FilterHandlerTest.java index bb7e69dc0..9c2ce416e 100644 --- a/test/org/traccar/FilterHandlerTest.java +++ b/test/org/traccar/FilterHandlerTest.java @@ -6,10 +6,46 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import org.junit.Before; import org.junit.Test; +import org.traccar.database.IdentityManager; import org.traccar.model.Position; +import org.traccar.model.Device; public class FilterHandlerTest { + static { + Context.init(new IdentityManager() { + + private Device createDevice() { + Device device = new Device(); + device.setId(1); + device.setName("test"); + device.setUniqueId("123456789012345"); + return device; + } + + @Override + public Device getDeviceById(long id) { + return createDevice(); + } + + @Override + public Device getDeviceByUniqueId(String uniqueId) { + return createDevice(); + } + + @Override + public Position getLastPosition(long deviceId) { + return null; + } + + @Override + public boolean isLatestPosition(Position position) { + return true; + } + + }); + } + private FilterHandler filtingHandler; private FilterHandler passingHandler; @@ -32,7 +68,7 @@ public class FilterHandlerTest { filtingHandler = null; passingHandler = null; } - + private Position createPosition( long deviceId, Date time, -- cgit v1.2.3 From 0d347cd7aac2ebfad01c1635f3893964be2e67ae Mon Sep 17 00:00:00 2001 From: Renaud Allard Date: Thu, 20 Oct 2016 07:19:10 +0200 Subject: Reuse EvenHandlerTest device rename log message variable --- src/org/traccar/FilterHandler.java | 18 ++++++++--------- test/org/traccar/FilterHandlerTest.java | 36 ++------------------------------- 2 files changed, 11 insertions(+), 43 deletions(-) (limited to 'test') diff --git a/src/org/traccar/FilterHandler.java b/src/org/traccar/FilterHandler.java index 9a6c7936a..f9904ccaf 100644 --- a/src/org/traccar/FilterHandler.java +++ b/src/org/traccar/FilterHandler.java @@ -176,15 +176,15 @@ public class FilterHandler extends BaseDataHandler { if (filterType.length() > 0 && !filterLimit(position)) { - StringBuilder logmsg = new StringBuilder(); - logmsg.append("Position filtered by "); - logmsg.append(filterType.toString()); - logmsg.append("filters from device: "); - logmsg.append(Context.getIdentityManager().getDeviceById(position.getDeviceId()).getUniqueId()); - logmsg.append(" with id: "); - logmsg.append(position.getDeviceId()); - - Log.info(logmsg.toString()); + StringBuilder message = new StringBuilder(); + message.append("Position filtered by "); + message.append(filterType.toString()); + message.append("filters from device: "); + message.append(Context.getIdentityManager().getDeviceById(position.getDeviceId()).getUniqueId()); + message.append(" with id: "); + message.append(position.getDeviceId()); + + Log.info(message.toString()); return true; } diff --git a/test/org/traccar/FilterHandlerTest.java b/test/org/traccar/FilterHandlerTest.java index 9c2ce416e..a03c04536 100644 --- a/test/org/traccar/FilterHandlerTest.java +++ b/test/org/traccar/FilterHandlerTest.java @@ -12,45 +12,13 @@ import org.traccar.model.Device; public class FilterHandlerTest { - static { - Context.init(new IdentityManager() { - - private Device createDevice() { - Device device = new Device(); - device.setId(1); - device.setName("test"); - device.setUniqueId("123456789012345"); - return device; - } - - @Override - public Device getDeviceById(long id) { - return createDevice(); - } - - @Override - public Device getDeviceByUniqueId(String uniqueId) { - return createDevice(); - } - - @Override - public Position getLastPosition(long deviceId) { - return null; - } - - @Override - public boolean isLatestPosition(Position position) { - return true; - } - - }); - } - + private EventHandlerTest deviceHandler; private FilterHandler filtingHandler; private FilterHandler passingHandler; @Before public void setUp() { + deviceHandler = new EventHandlerTest(); passingHandler = new FilterHandler(); filtingHandler = new FilterHandler(); filtingHandler.setFilterInvalid(true); -- cgit v1.2.3 From 838e60102dca8e0d9abaf4439493f7226fc3ef88 Mon Sep 17 00:00:00 2001 From: Renaud Allard Date: Thu, 20 Oct 2016 09:37:37 +0200 Subject: Create a BaseTest class and reuse it --- test/org/traccar/BaseTest.java | 43 +++++++++++++++++++++++++++++++++ test/org/traccar/EventHandlerTest.java | 36 +-------------------------- test/org/traccar/FilterHandlerTest.java | 4 +-- test/org/traccar/ProtocolTest.java | 36 +-------------------------- 4 files changed, 46 insertions(+), 73 deletions(-) create mode 100644 test/org/traccar/BaseTest.java (limited to 'test') diff --git a/test/org/traccar/BaseTest.java b/test/org/traccar/BaseTest.java new file mode 100644 index 000000000..0d74f50e5 --- /dev/null +++ b/test/org/traccar/BaseTest.java @@ -0,0 +1,43 @@ +package org.traccar; + +import org.traccar.database.IdentityManager; +import org.traccar.model.Device; +import org.traccar.model.Position; + +public class BaseTest { + + static { + Context.init(new IdentityManager() { + + private Device createDevice() { + Device device = new Device(); + device.setId(1); + device.setName("test"); + device.setUniqueId("123456789012345"); + return device; + } + + @Override + public Device getDeviceById(long id) { + return createDevice(); + } + + @Override + public Device getDeviceByUniqueId(String uniqueId) { + return createDevice(); + } + + @Override + public Position getLastPosition(long deviceId) { + return null; + } + + @Override + public boolean isLatestPosition(Position position) { + return true; + } + + }); + } + +} diff --git a/test/org/traccar/EventHandlerTest.java b/test/org/traccar/EventHandlerTest.java index 423a5084f..277dbeb40 100644 --- a/test/org/traccar/EventHandlerTest.java +++ b/test/org/traccar/EventHandlerTest.java @@ -4,40 +4,6 @@ import org.traccar.database.IdentityManager; import org.traccar.model.Device; import org.traccar.model.Position; -public class EventHandlerTest { +public class EventHandlerTest extends BaseTest { - static { - Context.init(new IdentityManager() { - - private Device createDevice() { - Device device = new Device(); - device.setId(1); - device.setName("test"); - device.setUniqueId("123456789012345"); - return device; - } - - @Override - public Device getDeviceById(long id) { - return createDevice(); - } - - @Override - public Device getDeviceByUniqueId(String uniqueId) { - return createDevice(); - } - - @Override - public Position getLastPosition(long deviceId) { - return null; - } - - @Override - public boolean isLatestPosition(Position position) { - return true; - } - - }); - } - } diff --git a/test/org/traccar/FilterHandlerTest.java b/test/org/traccar/FilterHandlerTest.java index a03c04536..ea06a490d 100644 --- a/test/org/traccar/FilterHandlerTest.java +++ b/test/org/traccar/FilterHandlerTest.java @@ -10,15 +10,13 @@ import org.traccar.database.IdentityManager; import org.traccar.model.Position; import org.traccar.model.Device; -public class FilterHandlerTest { +public class FilterHandlerTest extends BaseTest { - private EventHandlerTest deviceHandler; private FilterHandler filtingHandler; private FilterHandler passingHandler; @Before public void setUp() { - deviceHandler = new EventHandlerTest(); passingHandler = new FilterHandler(); filtingHandler = new FilterHandler(); filtingHandler.setFilterInvalid(true); diff --git a/test/org/traccar/ProtocolTest.java b/test/org/traccar/ProtocolTest.java index c6c957679..8211e9d6d 100644 --- a/test/org/traccar/ProtocolTest.java +++ b/test/org/traccar/ProtocolTest.java @@ -22,41 +22,7 @@ import java.util.List; import java.util.Map; import java.util.TimeZone; -public class ProtocolTest { - - static { - Context.init(new IdentityManager() { - - private Device createDevice() { - Device device = new Device(); - device.setId(1); - device.setName("test"); - device.setUniqueId("123456789012345"); - return device; - } - - @Override - public Device getDeviceById(long id) { - return createDevice(); - } - - @Override - public Device getDeviceByUniqueId(String uniqueId) { - return createDevice(); - } - - @Override - public Position getLastPosition(long deviceId) { - return null; - } - - @Override - public boolean isLatestPosition(Position position) { - return true; - } - - }); - } +public class ProtocolTest extends BaseTest { protected Position position(String time, boolean valid, double lat, double lon) throws ParseException { -- cgit v1.2.3 From d997b79ec28ae8f2d8778ee388c342dbf40bc40e Mon Sep 17 00:00:00 2001 From: Renaud Allard Date: Thu, 20 Oct 2016 09:51:16 +0200 Subject: Kill EventHandlerTest class, it has been replaced by BaseTest --- test/org/traccar/EventHandlerTest.java | 9 --------- test/org/traccar/events/AlertEventHandlerTest.java | 4 ++-- test/org/traccar/events/CommandResultEventHandlerTest.java | 4 ++-- test/org/traccar/events/IgnitionEventHandlerTest.java | 4 ++-- test/org/traccar/events/MotionEventHandlerTest.java | 4 ++-- 5 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 test/org/traccar/EventHandlerTest.java (limited to 'test') diff --git a/test/org/traccar/EventHandlerTest.java b/test/org/traccar/EventHandlerTest.java deleted file mode 100644 index 277dbeb40..000000000 --- a/test/org/traccar/EventHandlerTest.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.traccar; - -import org.traccar.database.IdentityManager; -import org.traccar.model.Device; -import org.traccar.model.Position; - -public class EventHandlerTest extends BaseTest { - -} diff --git a/test/org/traccar/events/AlertEventHandlerTest.java b/test/org/traccar/events/AlertEventHandlerTest.java index c6d5e07d9..77128f066 100644 --- a/test/org/traccar/events/AlertEventHandlerTest.java +++ b/test/org/traccar/events/AlertEventHandlerTest.java @@ -6,11 +6,11 @@ import static org.junit.Assert.assertNotNull; import java.util.Collection; import org.junit.Test; -import org.traccar.EventHandlerTest; +import org.traccar.BaseTest; import org.traccar.model.Event; import org.traccar.model.Position; -public class AlertEventHandlerTest extends EventHandlerTest { +public class AlertEventHandlerTest extends BaseTest { @Test public void testAlertEventHandler() throws Exception { diff --git a/test/org/traccar/events/CommandResultEventHandlerTest.java b/test/org/traccar/events/CommandResultEventHandlerTest.java index b09898b4a..f028e86ee 100644 --- a/test/org/traccar/events/CommandResultEventHandlerTest.java +++ b/test/org/traccar/events/CommandResultEventHandlerTest.java @@ -6,11 +6,11 @@ import static org.junit.Assert.assertNotNull; import java.util.Collection; import org.junit.Test; -import org.traccar.EventHandlerTest; +import org.traccar.BaseTest; import org.traccar.model.Event; import org.traccar.model.Position; -public class CommandResultEventHandlerTest extends EventHandlerTest { +public class CommandResultEventHandlerTest extends BaseTest { @Test public void testCommandResultEventHandler() throws Exception { diff --git a/test/org/traccar/events/IgnitionEventHandlerTest.java b/test/org/traccar/events/IgnitionEventHandlerTest.java index 96df6e1ed..ad329d139 100644 --- a/test/org/traccar/events/IgnitionEventHandlerTest.java +++ b/test/org/traccar/events/IgnitionEventHandlerTest.java @@ -6,11 +6,11 @@ import static org.junit.Assert.assertNotNull; import java.util.Collection; import org.junit.Test; -import org.traccar.EventHandlerTest; +import org.traccar.BaseTest; import org.traccar.model.Event; import org.traccar.model.Position; -public class IgnitionEventHandlerTest extends EventHandlerTest{ +public class IgnitionEventHandlerTest extends BaseTest { @Test public void testIgnitionEventHandler() throws Exception { diff --git a/test/org/traccar/events/MotionEventHandlerTest.java b/test/org/traccar/events/MotionEventHandlerTest.java index 34b2c481d..622680d91 100644 --- a/test/org/traccar/events/MotionEventHandlerTest.java +++ b/test/org/traccar/events/MotionEventHandlerTest.java @@ -6,11 +6,11 @@ import static org.junit.Assert.assertNotNull; import java.util.Collection; import org.junit.Test; -import org.traccar.EventHandlerTest; +import org.traccar.BaseTest; import org.traccar.model.Event; import org.traccar.model.Position; -public class MotionEventHandlerTest extends EventHandlerTest { +public class MotionEventHandlerTest extends BaseTest { @Test public void testMotionEventHandler() throws Exception { -- cgit v1.2.3