4 files changed, 46 insertions, 73 deletions
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 {