Be more defensive when checking nodes

We have a couple of failures, where we end up throwing a NPE
rather than an assertion. Clean them up.

Change-Id: Ib70a04fb398ba4ce789fcef9b08bb90f4b21c967
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit d1070855b00ce640dc67cb9e83a7d9a11d4b6b38)

diff --git a/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologySessionListenerTest.java b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologySessionListenerTest.java
index 313e757b8a248316982785c2c0f41b6ee17e4ea4..9899fdf47d80b009c69ad9e69407c160e8acd00c 100644 (file)
--- a/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologySessionListenerTest.java
+++ b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologySessionListenerTest.java
@@ -396,7 +396,7 @@ public class PCEPTopologySessionListenerTest
                 Optional.of(MsgBuilderUtil.createSrp(srpId)), MsgBuilderUtil.createPath(req.getEro().getSubobject()));
         this.listener.onMessage(this.session, pcRpt);
         readDataOperational(getDataBroker(), TOPO_IID, topology -> {
-            assertEquals(1, topology.getNode().size());
+            assertEquals(1, topology.nonnullNode().size());
             return topology;
         });
     }
@@ -420,7 +420,7 @@ public class PCEPTopologySessionListenerTest
                 Optional.of(MsgBuilderUtil.createSrp(srpId)), MsgBuilderUtil.createPath(req.getEro().getSubobject()));
         this.listener.onMessage(this.session, pcRpt);
         readDataOperational(getDataBroker(), TOPO_IID, topology -> {
-            assertEquals(1, topology.getNode().size());
+            assertEquals(1, topology.nonnullNode().size());
             return topology;
         });
 
@@ -459,7 +459,7 @@ public class PCEPTopologySessionListenerTest
                 Optional.of(MsgBuilderUtil.createSrp(srpId)), MsgBuilderUtil.createPath(req.getEro().getSubobject()));
         this.listener.onMessage(this.session, pcRpt);
         readDataOperational(getDataBroker(), TOPO_IID, topology -> {
-            assertEquals(1, topology.getNode().size());
+            assertEquals(1, topology.nonnullNode().size());
             return topology;
         });
 
@@ -494,7 +494,7 @@ public class PCEPTopologySessionListenerTest
         this.listener.onSessionUp(this.session);
         this.listener.onMessage(this.session, rptmsg);
         readDataOperational(getDataBroker(), TOPO_IID, node -> {
-            assertFalse(node.getNode().isEmpty());
+            assertFalse(node.nonnullNode().isEmpty());
             return node;
         });
     }