aboutsummaryrefslogtreecommitdiff
path: root/test/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-10-13 11:12:18 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-10-13 11:12:18 +1300
commit43a64fc359f8acf08f97d70ebdb93dafa607dc08 (patch)
tree52da0b19c3da83a57348f603e7dd6467b6717b96 /test/org/traccar
parente997c2642b35350241614acaef6d606e37223fe6 (diff)
downloadtraccar-server-43a64fc359f8acf08f97d70ebdb93dafa607dc08.tar.gz
traccar-server-43a64fc359f8acf08f97d70ebdb93dafa607dc08.tar.bz2
traccar-server-43a64fc359f8acf08f97d70ebdb93dafa607dc08.zip
Remove data model and fix some issues
Diffstat (limited to 'test/org/traccar')
-rw-r--r--test/org/traccar/helper/DecoderVerifier.java21
1 files changed, 3 insertions, 18 deletions
diff --git a/test/org/traccar/helper/DecoderVerifier.java b/test/org/traccar/helper/DecoderVerifier.java
index 28220b711..38f73aabc 100644
--- a/test/org/traccar/helper/DecoderVerifier.java
+++ b/test/org/traccar/helper/DecoderVerifier.java
@@ -5,7 +5,6 @@ import java.util.List;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import org.traccar.model.Data;
import org.traccar.model.Position;
public class DecoderVerifier {
@@ -43,14 +42,6 @@ public class DecoderVerifier {
assertNotNull(position.getAttributes());
}
-
- private static void verifyData(Data data) {
-
- assertNotNull(data.getDeviceId());
-
- assertNotNull(data.getAttributes());
-
- }
public static void verify(Object object) {
@@ -58,19 +49,13 @@ public class DecoderVerifier {
if (object instanceof Position) {
verifyPosition((Position) object);
- } else if (object instanceof Data) {
- verifyData((Data) object);
} else if (object instanceof List) {
- List positions = (List) object;
+ List<Position> positions = (List<Position>) object;
assertFalse(positions.isEmpty());
- for (Object item : positions) {
- if (item instanceof Position) {
- verifyPosition((Position) item);
- } else if (item instanceof Data) {
- verifyData((Data) item);
- }
+ for (Position position : positions) {
+ verifyPosition(position);
}
}