Merge branch 'master' into master

1 files changed, 6 insertions, 6 deletions

diff --git a/test/org/traccar/BaseTest.java b/test/org/traccar/BaseTest.java
index 6af8610cd..4b9ee5451 100644
--- a/test/org/traccar/BaseTest.java
+++ b/test/org/traccar/BaseTest.java
@@ -18,12 +18,12 @@ public class BaseTest {
             }
 
             @Override
-            public Device getDeviceById(long id) {
+            public Device getById(long id) {
                 return createDevice();
             }
 
             @Override
-            public Device getDeviceByUniqueId(String uniqueId) {
+            public Device getByUniqueId(String uniqueId) {
                 return createDevice();
             }
             
@@ -40,25 +40,25 @@ public class BaseTest {
             @Override
             public boolean lookupAttributeBoolean(
                     long deviceId, String attributeName, boolean defaultValue, boolean lookupConfig) {
-                return false;
+                return defaultValue;
             }
 
             @Override
             public String lookupAttributeString(
                     long deviceId, String attributeName, String defaultValue, boolean lookupConfig) {
-                return null;
+                return defaultValue;
             }
 
             @Override
             public int lookupAttributeInteger(
                     long deviceId, String attributeName, int defaultValue, boolean lookupConfig) {
-                return 0;
+                return defaultValue;
             }
 
             @Override
             public long lookupAttributeLong(
                     long deviceId, String attributeName, long defaultValue, boolean lookupConfig) {
-                return 0;
+                return defaultValue;
             }
 
         });