From 43a64fc359f8acf08f97d70ebdb93dafa607dc08 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Tue, 13 Oct 2015 11:12:18 +1300
Subject: Remove data model and fix some issues

---
 test/org/traccar/helper/DecoderVerifier.java | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

(limited to 'test/org/traccar/helper')

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);
             }
         }
         
-- 
cgit v1.2.3