Merge commands implementation (fix #7)

1 files changed, 9 insertions, 4 deletions

diff --git a/test/org/traccar/helper/TestIdentityManager.java b/test/org/traccar/helper/TestIdentityManager.java
index a4ddeeb09..d279241e4 100644
--- a/test/org/traccar/helper/TestIdentityManager.java
+++ b/test/org/traccar/helper/TestIdentityManager.java
@@ -4,17 +4,22 @@ import org.traccar.database.IdentityManager;
 import org.traccar.model.Device;
 
 public class TestIdentityManager implements IdentityManager {
+    
+    private final Device device;
+    
+    public TestIdentityManager() {
+        device = new Device();
+        device.setId(1);
+        device.setUniqueId("123456789012345");
+    }
 
     @Override
     public Device getDeviceById(long id) {
-        return null;
+        return device;
     }
     
     @Override
     public Device getDeviceByUniqueId(String imei) {
-        Device device = new Device();
-        device.setId(new Long(1));
-        device.setUniqueId("123456789012345");
         return device;
     }