Rework failing test testStateful07TopologySessionListener

Change-Id: Id48d30e15351217a9738de742dec2d2581480d29
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>

diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerTest.java b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerTest.java
index 10a7981e1e3329299f0fd6ce15e5e0fffe13dd2e..dce4fbcf1f47b2a336b763533e8dd43d1249d341 100755 (executable)
--- a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerTest.java
+++ b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerTest.java
@@ -209,22 +209,20 @@ public class Stateful07TopologySessionListenerTest extends AbstractPCEPSessionTe
             final Path path = reportedLsp.getPath().get(0);
             assertEquals(2, path.getEro().getSubobject().size());
             assertEquals(this.dstIpPrefix, getLastEroIpPrefix(path.getEro()));
+            assertEquals(1, this.listener.getDelegatedLspsCount().intValue());
+            assertTrue(this.listener.getSynchronized());
+            assertTrue(this.listener.getStatefulMessages().getLastReceivedRptMsgTimestamp() > 0);
+            assertEquals(3, this.listener.getStatefulMessages().getReceivedRptMsgCount().intValue());
+            assertEquals(1, this.listener.getStatefulMessages().getSentInitMsgCount().intValue());
+            assertEquals(1, this.listener.getStatefulMessages().getSentUpdMsgCount().intValue());
+            assertTrue(this.listener.getReplyTime().getAverageTime() > 0);
+            assertTrue(this.listener.getReplyTime().getMaxTime() > 0);
+            assertFalse(this.listener.getPeerCapabilities().getActive());
+            assertTrue(this.listener.getPeerCapabilities().getInstantiation());
+            assertTrue(this.listener.getPeerCapabilities().getStateful());
             return pcc;
         });
 
-        // check stats
-        checkEquals(()->assertEquals(1, this.listener.getDelegatedLspsCount().intValue()));
-        checkEquals(()-> assertTrue(this.listener.getSynchronized()));
-        checkEquals(()-> assertTrue(this.listener.getStatefulMessages().getLastReceivedRptMsgTimestamp() > 0));
-        checkEquals(()->assertEquals(3, this.listener.getStatefulMessages().getReceivedRptMsgCount().intValue()));
-        checkEquals(()->assertEquals(1, this.listener.getStatefulMessages().getSentInitMsgCount().intValue()));
-        checkEquals(()->assertEquals(1, this.listener.getStatefulMessages().getSentUpdMsgCount().intValue()));
-        checkEquals(()->assertTrue(this.listener.getReplyTime().getAverageTime() > 0));
-        checkEquals(()->assertTrue(this.listener.getReplyTime().getMaxTime() > 0));
-        checkEquals(()->assertFalse(this.listener.getPeerCapabilities().getActive()));
-        checkEquals(()->assertTrue(this.listener.getPeerCapabilities().getInstantiation()));
-        checkEquals(()->assertTrue(this.listener.getPeerCapabilities().getStateful()));
-
         // ensure-operational
         final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.ensure.lsp.
             operational.args.ArgumentsBuilder ensureArgs = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.