Remove unused routedRpcRegistration

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / statistics / services / direct / OpendaylightDirectStatisticsServiceImplTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/OpendaylightDirectStatisticsServiceImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/OpendaylightDirectStatisticsServiceImplTest.java
index 33b0746aa9635cb325a976aa2853d2d4bd4ea930..21d1d9010f6efc9b621eb532b1af075dacdbe2b0 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/OpendaylightDirectStatisticsServiceImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/OpendaylightDirectStatisticsServiceImplTest.java
@@ -17,7 +17,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetFlowStatisticsInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetFlowStatisticsOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetGroupStatisticsInput;
@@ -35,15 +35,15 @@ import org.opendaylight.yangtools.yang.common.RpcResult;
 @RunWith(MockitoJUnitRunner.class)
 public class OpendaylightDirectStatisticsServiceImplTest {
     @Mock
-    FlowDirectStatisticsService flowDirectStatisticsService;
+    AbstractFlowDirectStatisticsService flowDirectStatisticsService;
     @Mock
-    GroupDirectStatisticsService groupDirectStatisticsService;
+    AbstractGroupDirectStatisticsService groupDirectStatisticsService;
     @Mock
-    MeterDirectStatisticsService meterDirectStatisticsService;
+    AbstractMeterDirectStatisticsService meterDirectStatisticsService;
     @Mock
-    NodeConnectorDirectStatisticsService nodeConnectorDirectStatisticsService;
+    AbstractPortDirectStatisticsService nodeConnectorDirectStatisticsService;
     @Mock
-    QueueDirectStatisticsService queueDirectStatisticsService;
+    AbstractQueueDirectStatisticsService queueDirectStatisticsService;
 
     @Mock
     GetGroupStatisticsInput getGroupStatisticsInput;
@@ -55,25 +55,25 @@ public class OpendaylightDirectStatisticsServiceImplTest {
     GetMeterStatisticsInput getMeterStatisticsInput;
     @Mock
     GetNodeConnectorStatisticsInput getNodeConnectorStatisticsInput;
-    
+
     private OpendaylightDirectStatisticsService service;
     private OpendaylightDirectStatisticsService emptyService;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         final OpendaylightDirectStatisticsServiceProvider provider = new OpendaylightDirectStatisticsServiceProvider();
-        provider.register(FlowDirectStatisticsService.class, flowDirectStatisticsService);
-        provider.register(GroupDirectStatisticsService.class, groupDirectStatisticsService);
-        provider.register(MeterDirectStatisticsService.class, meterDirectStatisticsService);
-        provider.register(NodeConnectorDirectStatisticsService.class, nodeConnectorDirectStatisticsService);
-        provider.register(QueueDirectStatisticsService.class, queueDirectStatisticsService);
+        provider.register(AbstractFlowDirectStatisticsService.class, flowDirectStatisticsService);
+        provider.register(AbstractGroupDirectStatisticsService.class, groupDirectStatisticsService);
+        provider.register(AbstractMeterDirectStatisticsService.class, meterDirectStatisticsService);
+        provider.register(AbstractPortDirectStatisticsService.class, nodeConnectorDirectStatisticsService);
+        provider.register(AbstractQueueDirectStatisticsService.class, queueDirectStatisticsService);
 
         service = new OpendaylightDirectStatisticsServiceImpl(provider);
         emptyService = new OpendaylightDirectStatisticsServiceImpl(new OpendaylightDirectStatisticsServiceProvider());
     }
 
     @Test
-    public void testGetGroupStatistics() throws Exception {
+    public void testGetGroupStatistics() {
         service.getGroupStatistics(getGroupStatisticsInput);
         verify(groupDirectStatisticsService).handleAndReply(getGroupStatisticsInput);
     }
@@ -87,14 +87,14 @@ public class OpendaylightDirectStatisticsServiceImplTest {
         assertFalse(result.isSuccessful());
 
         for (RpcError error : result.getErrors()) {
-            assertTrue(error.getMessage().contains(GroupDirectStatisticsService.class.getSimpleName()));
+            assertTrue(error.getMessage().contains(AbstractGroupDirectStatisticsService.class.getSimpleName()));
         }
 
         verify(groupDirectStatisticsService, times(0)).handleAndReply(getGroupStatisticsInput);
     }
 
     @Test
-    public void testGetQueueStatistics() throws Exception {
+    public void testGetQueueStatistics() {
         service.getQueueStatistics(getQueueStatisticsInput);
         verify(queueDirectStatisticsService).handleAndReply(getQueueStatisticsInput);
     }
@@ -108,14 +108,14 @@ public class OpendaylightDirectStatisticsServiceImplTest {
         assertFalse(result.isSuccessful());
 
         for (RpcError error : result.getErrors()) {
-            assertTrue(error.getMessage().contains(QueueDirectStatisticsService.class.getSimpleName()));
+            assertTrue(error.getMessage().contains(AbstractQueueDirectStatisticsService.class.getSimpleName()));
         }
 
         verify(queueDirectStatisticsService, times(0)).handleAndReply(getQueueStatisticsInput);
     }
 
     @Test
-    public void testGetFlowStatistics() throws Exception {
+    public void testGetFlowStatistics() {
         service.getFlowStatistics(getFlowStatisticsInput);
         verify(flowDirectStatisticsService).handleAndReply(getFlowStatisticsInput);
     }
@@ -129,14 +129,14 @@ public class OpendaylightDirectStatisticsServiceImplTest {
         assertFalse(result.isSuccessful());
 
         for (RpcError error : result.getErrors()) {
-            assertTrue(error.getMessage().contains(FlowDirectStatisticsService.class.getSimpleName()));
+            assertTrue(error.getMessage().contains(AbstractFlowDirectStatisticsService.class.getSimpleName()));
         }
 
         verify(flowDirectStatisticsService, times(0)).handleAndReply(getFlowStatisticsInput);
     }
 
     @Test
-    public void testGetMeterStatistics() throws Exception {
+    public void testGetMeterStatistics() {
         service.getMeterStatistics(getMeterStatisticsInput);
         verify(meterDirectStatisticsService).handleAndReply(getMeterStatisticsInput);
     }
@@ -150,14 +150,14 @@ public class OpendaylightDirectStatisticsServiceImplTest {
         assertFalse(result.isSuccessful());
 
         for (RpcError error : result.getErrors()) {
-            assertTrue(error.getMessage().contains(MeterDirectStatisticsService.class.getSimpleName()));
+            assertTrue(error.getMessage().contains(AbstractMeterDirectStatisticsService.class.getSimpleName()));
         }
 
         verify(meterDirectStatisticsService, times(0)).handleAndReply(getMeterStatisticsInput);
     }
 
     @Test
-    public void testGetNodeConnectorStatistics() throws Exception {
+    public void testGetNodeConnectorStatistics() {
         service.getNodeConnectorStatistics(getNodeConnectorStatisticsInput);
         verify(nodeConnectorDirectStatisticsService).handleAndReply(getNodeConnectorStatisticsInput);
     }
@@ -171,9 +171,9 @@ public class OpendaylightDirectStatisticsServiceImplTest {
         assertFalse(result.isSuccessful());
 
         for (RpcError error : result.getErrors()) {
-            assertTrue(error.getMessage().contains(NodeConnectorDirectStatisticsService.class.getSimpleName()));
+            assertTrue(error.getMessage().contains(AbstractPortDirectStatisticsService.class.getSimpleName()));
         }
 
         verify(nodeConnectorDirectStatisticsService, times(0)).handleAndReply(getNodeConnectorStatisticsInput);
     }
-}
\ No newline at end of file
+}