X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fstatistics-manager%2Fsrc%2Ftest%2Fjava%2Ftest%2Fmock%2FNodeRegistrationTest.java;h=79eb23608906d58e01f9fefc5b2235f07e56613f;hb=3a71a222b896b9d07e638af62300180799bdac67;hp=18bd2d42ef404d2f3c1c5d047760c249afa7e2f4;hpb=95d1074f7f446784f76dc41525cecdb65688df6c;p=controller.git

diff --git a/opendaylight/md-sal/statistics-manager/src/test/java/test/mock/NodeRegistrationTest.java b/opendaylight/md-sal/statistics-manager/src/test/java/test/mock/NodeRegistrationTest.java
index 18bd2d42ef..79eb236089 100644
--- a/opendaylight/md-sal/statistics-manager/src/test/java/test/mock/NodeRegistrationTest.java
+++ b/opendaylight/md-sal/statistics-manager/src/test/java/test/mock/NodeRegistrationTest.java
@@ -1,48 +1,43 @@
 package test.mock;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.concurrent.ExecutionException;
-
-import org.opendaylight.controller.md.statistics.manager.StatisticsManagerActivator;
-import org.opendaylight.controller.md.statistics.manager.StatisticsManagerProvider;
+import org.junit.Test;
+import org.opendaylight.controller.md.statistics.manager.StatisticsManager;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
 import test.mock.util.StatisticsManagerTest;
 
+import java.util.concurrent.ExecutionException;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 public class NodeRegistrationTest extends StatisticsManagerTest {
 
-//    @Test
+    @Test
     public void nodeRegistrationTest() throws ExecutionException, InterruptedException {
-        final StatisticsManagerActivator activator = new StatisticsManagerActivator();
-        final StatisticsManagerProvider statisticsManagerProvider = new StatisticsManagerProvider(activator);
-        activator.onSessionInitiated(providerContext);
+        StatisticsManager statisticsManager = setupStatisticsManager();
 
         addFlowCapableNode(s1Key);
-        Thread.sleep(1000);
+        Thread.sleep(2000);
         final InstanceIdentifier<Node> nodeII = InstanceIdentifier.create(Nodes.class).child(Node.class, s1Key);
 
-        assertTrue(statisticsManagerProvider.getStatisticsManager().isProvidedFlowNodeActive(nodeII));
+        assertTrue(statisticsManager.isProvidedFlowNodeActive(nodeII));
     }
 
-//    @Test
+    @Test
     public void nodeUnregistrationTest() throws ExecutionException, InterruptedException {
-        final StatisticsManagerActivator activator = new StatisticsManagerActivator();
-        final StatisticsManagerProvider statisticsManagerProvider = new StatisticsManagerProvider(activator);
-        activator.onSessionInitiated(providerContext);
+        StatisticsManager statisticsManager = setupStatisticsManager();
 
         addFlowCapableNode(s1Key);
-        Thread.sleep(1000);
+        Thread.sleep(2000);
         final InstanceIdentifier<Node> nodeII = InstanceIdentifier.create(Nodes.class).child(Node.class, s1Key);
 
-        assertTrue(statisticsManagerProvider.getStatisticsManager().isProvidedFlowNodeActive(nodeII));
+        assertTrue(statisticsManager.isProvidedFlowNodeActive(nodeII));
 
         removeNode(s1Key);
-        Thread.sleep(1000);
-        assertFalse(statisticsManagerProvider.getStatisticsManager().isProvidedFlowNodeActive(nodeII));
+        Thread.sleep(2000);
+        assertFalse(statisticsManager.isProvidedFlowNodeActive(nodeII));
     }
 }