Bump mdsal to 5.0.2

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

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowStatisticsServiceImpl1Test.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowStatisticsServiceImpl1Test.java
index 5fb40eac6ec5eceaf8df9ebb5c6b2c57ef578d58..24c097c927aecb7a130508d04d913b33dfadca63 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowStatisticsServiceImpl1Test.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowStatisticsServiceImpl1Test.java
@@ -5,15 +5,15 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.openflowplugin.impl.statistics.services;
 
 import java.util.concurrent.Future;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
-import org.mockito.Mockito;
 import org.opendaylight.openflowplugin.impl.rpc.AbstractRequestContext;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManager;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManagerFactory;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAggregateFlowStatisticsFromFlowTableForAllFlowsInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAllFlowStatisticsFromFlowTableInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAllFlowsStatisticsFromAllFlowTablesInputBuilder;
@@ -22,34 +22,37 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.G
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TableId;
 import org.opendaylight.yangtools.yang.common.RpcResult;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 /**
- * Test for {@link OpendaylightFlowStatisticsServiceImpl} - only delegated methods (failing)
+ * Test for {@link OpendaylightFlowStatisticsServiceImpl} - only delegated methods (failing).
  */
 public class OpendaylightFlowStatisticsServiceImpl1Test extends AbstractStatsServiceTest {
 
     @Captor
     private ArgumentCaptor<MultipartRequestInput> requestInput;
 
-    private AbstractRequestContext<Object> rqContext;
-
     private OpendaylightFlowStatisticsServiceImpl flowStatisticsService;
 
+    @Override
     public void setUp() {
-        flowStatisticsService = new OpendaylightFlowStatisticsServiceImpl(rqContextStack, deviceContext);
+        final ConvertorManager convertorManager = ConvertorManagerFactory.createDefaultManager();
+        flowStatisticsService =
+                OpendaylightFlowStatisticsServiceImpl.createWithOook(rqContextStack, deviceContext, convertorManager);
 
-        rqContext = new AbstractRequestContext<Object>(42L) {
+        AbstractRequestContext<Object> rqContext = new AbstractRequestContext<>(Uint32.valueOf(42)) {
             @Override
             public void close() {
                 //NOOP
             }
         };
-        Mockito.when(rqContextStack.<Object>createRequestContext()).thenReturn(rqContext);
+        //Mockito.when(rqContextStack.<Object>createRequestContext()).thenReturn(rqContext);
     }
 
     @Test(expected = IllegalAccessError.class)
-    public void testGetAggregateFlowStatisticsFromFlowTableForAllFlows() throws Exception {
-        GetAggregateFlowStatisticsFromFlowTableForAllFlowsInputBuilder input = new GetAggregateFlowStatisticsFromFlowTableForAllFlowsInputBuilder()
+    public void testGetAggregateFlowStatisticsFromFlowTableForAllFlows() {
+        GetAggregateFlowStatisticsFromFlowTableForAllFlowsInputBuilder input =
+                new GetAggregateFlowStatisticsFromFlowTableForAllFlowsInputBuilder()
                 .setNode(createNodeRef("unitProt:123"))
                 .setTableId(new TableId((short) 1));
 
@@ -57,7 +60,7 @@ public class OpendaylightFlowStatisticsServiceImpl1Test extends AbstractStatsSer
     }
 
     @Test(expected = IllegalAccessError.class)
-    public void testGetAllFlowStatisticsFromFlowTable() throws Exception {
+    public void testGetAllFlowStatisticsFromFlowTable() {
         GetAllFlowStatisticsFromFlowTableInputBuilder input = new GetAllFlowStatisticsFromFlowTableInputBuilder()
                 .setNode(createNodeRef("unitProt:123"))
                 .setTableId(new TableId((short) 1));
@@ -66,15 +69,16 @@ public class OpendaylightFlowStatisticsServiceImpl1Test extends AbstractStatsSer
     }
 
     @Test(expected = IllegalAccessError.class)
-    public void testGetAllFlowsStatisticsFromAllFlowTables() throws Exception {
-        GetAllFlowsStatisticsFromAllFlowTablesInputBuilder input = new GetAllFlowsStatisticsFromAllFlowTablesInputBuilder()
+    public void testGetAllFlowsStatisticsFromAllFlowTables() {
+        GetAllFlowsStatisticsFromAllFlowTablesInputBuilder input =
+                new GetAllFlowsStatisticsFromAllFlowTablesInputBuilder()
                 .setNode(createNodeRef("unitProt:123"));
 
         flowStatisticsService.getAllFlowsStatisticsFromAllFlowTables(input.build());
     }
 
     @Test(expected = IllegalAccessError.class)
-    public void testGetFlowStatisticsFromFlowTable() throws Exception {
+    public void testGetFlowStatisticsFromFlowTable() {
         GetFlowStatisticsFromFlowTableInputBuilder input = new GetFlowStatisticsFromFlowTableInputBuilder()
                 .setNode(createNodeRef("unitProt:123"))
                 .setPriority(5);