Update node tests (#488)

Signed-off-by: Chris Jackson <chris@cd-jackson.com>

Author: cdjackson

com.zsmartsystems.zigbee/src/main/java/com/zsmartsystems/zigbee/ZigBeeNode.java

@@ -480,6 +480,12 @@ public void run() {
         }
     }
 
+    /**
+     * Adds a {@link ZigBeeNetworkEndpointListener} to the node. The listener will be notified of any addition or
+     * removal of endpoints in the node.
+     *
+     * @param networkDeviceListener the {@link ZigBeeNetworkEndpointListener} to add
+     */
     public void addNetworkEndpointListener(final ZigBeeNetworkEndpointListener networkDeviceListener) {
         synchronized (this) {
             final List<ZigBeeNetworkEndpointListener> modifiedListeners = new ArrayList<ZigBeeNetworkEndpointListener>(
@@ -489,6 +495,11 @@ public void addNetworkEndpointListener(final ZigBeeNetworkEndpointListener netwo
         }
     }
 
+    /**
+     * Removes the {@link ZigBeeNetworkEndpointListener}
+     * 
+     * @param networkDeviceListener the {@link ZigBeeNetworkEndpointListener} to remove
+     */
     public void removeNetworkEndpointListener(final ZigBeeNetworkEndpointListener networkDeviceListener) {
         synchronized (this) {
             final List<ZigBeeNetworkEndpointListener> modifiedListeners = new ArrayList<ZigBeeNetworkEndpointListener>(
@@ -813,7 +824,7 @@ public ZigBeeNodeState getNodeState() {
     public String toString() {
         StringBuilder builder = new StringBuilder(100);
 
-        builder.append("ZigBeeNode [state");
+        builder.append("ZigBeeNode [state=");
         builder.append(nodeState);
         builder.append(", IEEE=");
         builder.append(ieeeAddress);

com.zsmartsystems.zigbee/src/test/java/com/zsmartsystems/zigbee/ZigBeeNodeTest.java

@@ -24,6 +24,7 @@
 import com.zsmartsystems.zigbee.ZigBeeNode.ZigBeeNodeState;
 import com.zsmartsystems.zigbee.serialization.DefaultDeserializer;
 import com.zsmartsystems.zigbee.zcl.ZclCommand;
+import com.zsmartsystems.zigbee.zdo.ZdoCommand;
 import com.zsmartsystems.zigbee.zdo.field.NeighborTable;
 import com.zsmartsystems.zigbee.zdo.field.NodeDescriptor;
 import com.zsmartsystems.zigbee.zdo.field.NodeDescriptor.LogicalType;
@@ -35,6 +36,8 @@
 import com.zsmartsystems.zigbee.zdo.field.RoutingTable.DiscoveryState;
 
 public class ZigBeeNodeTest {
+    static final int TIMEOUT = 5000;
+
     @Test
     public void testAddDescriptors() {
         ZigBeeNode node = new ZigBeeNode(Mockito.mock(ZigBeeNetworkManager.class), new IeeeAddress());
@@ -375,14 +378,29 @@ public void testUpdated() {
     @Test
     public void isDiscovered() {
         ZigBeeNode node = new ZigBeeNode(Mockito.mock(ZigBeeNetworkManager.class), new IeeeAddress("1234567890"));
+        ZigBeeNetworkEndpointListener listener = Mockito.mock(ZigBeeNetworkEndpointListener.class);
+        node.addNetworkEndpointListener(listener);
+
         assertFalse(node.isDiscovered());
+        assertNotNull(node.getEndpoints());
 
         NodeDescriptor descriptor = new NodeDescriptor(0, 3333, 74, true, 6666, 0, 6, 4444, true, 8);
         node.setNodeDescriptor(descriptor);
         assertFalse(node.isDiscovered());
 
-        node.addEndpoint(new ZigBeeEndpoint(node, 1));
+        ZigBeeEndpoint endpoint = new ZigBeeEndpoint(node, 1);
+        node.addEndpoint(endpoint);
         assertTrue(node.isDiscovered());
+        Mockito.verify(listener, Mockito.timeout(TIMEOUT)).deviceAdded(endpoint);
+
+        assertEquals(endpoint, node.getEndpoint(1));
+        assertEquals(1, node.getEndpoints().size());
+
+        node.removeEndpoint(1);
+        assertEquals(0, node.getEndpoints().size());
+        Mockito.verify(listener, Mockito.timeout(TIMEOUT)).deviceRemoved(endpoint);
+
+        node.removeNetworkEndpointListener(listener);
     }
 
     @Test
@@ -429,6 +447,12 @@ public void commandReceived() {
         node.commandReceived(unicast);
         Mockito.verify(endpoint1, Mockito.times(1)).commandReceived(unicast);
         Mockito.verify(endpoint2, Mockito.times(0)).commandReceived(unicast);
+
+        ZdoCommand zdoCommand = Mockito.mock(ZdoCommand.class);
+        ZigBeeAddress zdoSource = Mockito.mock(ZigBeeAddress.class);
+        Mockito.when(zdoSource.getAddress()).thenReturn(12345);
+        Mockito.when(zdoCommand.getSourceAddress()).thenReturn(zdoSource);
+        node.commandReceived(zdoCommand);
     }
 
     @Test
@@ -437,7 +461,9 @@ public void setNodeState() {
 
         assertFalse(node.setNodeState(ZigBeeNodeState.UNKNOWN));
         assertTrue(node.setNodeState(ZigBeeNodeState.ONLINE));
+        assertEquals(ZigBeeNodeState.ONLINE, node.getNodeState());
         assertTrue(node.setNodeState(ZigBeeNodeState.OFFLINE));
         assertFalse(node.setNodeState(ZigBeeNodeState.OFFLINE));
+        assertEquals(ZigBeeNodeState.OFFLINE, node.getNodeState());
     }
 }