Add devices to group tree

1 files changed, 24 insertions, 6 deletions

diff --git a/test/org/traccar/database/GroupTreeTest.java b/test/org/traccar/database/GroupTreeTest.java
index 26ac595f8..f73cb75b6 100644
--- a/test/org/traccar/database/GroupTreeTest.java
+++ b/test/org/traccar/database/GroupTreeTest.java
@@ -2,6 +2,7 @@ package org.traccar.database;
 
 import org.junit.Assert;
 import org.junit.Test;
+import org.traccar.model.Device;
 import org.traccar.model.Group;
 
 import java.util.ArrayList;
@@ -16,7 +17,15 @@ public class GroupTreeTest {
         group.setGroupId(parent);
         return group;
     }
-    
+
+    private static Device createDevice(long id, String name, long parent) {
+        Device device = new Device();
+        device.setId(id);
+        device.setName(name);
+        device.setGroupId(parent);
+        return device;
+    }
+
     @Test
     public void testGetDescendants() {
         Collection<Group> groups = new ArrayList<>();
@@ -26,12 +35,21 @@ public class GroupTreeTest {
         groups.add(createGroup(4, "Fourth", 2));
         groups.add(createGroup(5, "Fifth", 4));
 
-        GroupTree groupTree = new GroupTree(groups);
+        Collection<Device> devices = new ArrayList<>();
+        devices.add(createDevice(1, "One", 3));
+        devices.add(createDevice(2, "Two", 5));
+        devices.add(createDevice(3, "One", 5));
+
+        GroupTree groupTree = new GroupTree(groups, devices);
+
+        Assert.assertEquals(4, groupTree.getGroups(1).size());
+        Assert.assertEquals(3, groupTree.getGroups(2).size());
+        Assert.assertEquals(0, groupTree.getGroups(3).size());
+        Assert.assertEquals(1, groupTree.getGroups(4).size());
 
-        Assert.assertEquals(4, groupTree.getDescendants(1).size());
-        Assert.assertEquals(3, groupTree.getDescendants(2).size());
-        Assert.assertEquals(0, groupTree.getDescendants(3).size());
-        Assert.assertEquals(1, groupTree.getDescendants(4).size());
+        Assert.assertEquals(3, groupTree.getDevices(1).size());
+        Assert.assertEquals(1, groupTree.getDevices(3).size());
+        Assert.assertEquals(2, groupTree.getDevices(4).size());
     }
 
 }