Decompose RPC implementation classes

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

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowStatisticsServiceImpl2Test.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowStatisticsServiceImpl2Test.java
index f48b3c8e3e50030ad0292aa1c1b1ac9b88024979..2a1d87c77bfc98956f1a6c88578de7662564ada4 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowStatisticsServiceImpl2Test.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowStatisticsServiceImpl2Test.java
@@ -5,38 +5,35 @@
  * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.ArgumentMatchers.same;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.when;
 
-import com.google.common.util.concurrent.FutureCallback;
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.Future;
-import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.stubbing.Answer;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowplugin.api.openflow.device.MessageTranslator;
 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.GetAggregateFlowStatisticsFromFlowTableForGivenMatchInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAggregateFlowStatisticsFromFlowTableForGivenMatchOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.get.aggregate.flow.statistics.from.flow.table._for.given.match.output.AggregatedFlowStatistics;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.get.aggregate.flow.statistics.from.flow.table._for.given.match.output.AggregatedFlowStatisticsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReply;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReplyMessageBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestInput;
-import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint32;
@@ -46,7 +43,6 @@ import org.opendaylight.yangtools.yang.common.Uint8;
  * Test for {@link OpendaylightFlowStatisticsServiceImpl} - only not delegated method.
  */
 public class OpendaylightFlowStatisticsServiceImpl2Test extends AbstractStatsServiceTest {
-
     @Captor
     private ArgumentCaptor<MultipartRequestInput> requestInput;
     @Mock
@@ -54,15 +50,15 @@ public class OpendaylightFlowStatisticsServiceImpl2Test extends AbstractStatsSer
 
     private AbstractRequestContext<List<MultipartReply>> rqContextMp;
 
-    private OpendaylightFlowStatisticsServiceImpl flowStatisticsService;
-
+    private GetAggregateFlowStatisticsFromFlowTableForGivenMatchImpl
+        getAggregateFlowStatisticsFromFlowTableForGivenMatch;
 
     @Override
     public void setUp() {
-        final ConvertorManager convertorManager = ConvertorManagerFactory.createDefaultManager();
-        flowStatisticsService = OpendaylightFlowStatisticsServiceImpl.createWithOook(rqContextStack,
-                                                                                     deviceContext,
-                                                                                     convertorManager);
+        final var convertorManager = ConvertorManagerFactory.createDefaultManager();
+        getAggregateFlowStatisticsFromFlowTableForGivenMatch =
+            new GetAggregateFlowStatisticsFromFlowTableForGivenMatchImpl(rqContextStack, deviceContext,
+                convertorManager);
 
         rqContextMp = new AbstractRequestContext<>(Uint32.valueOf(42L)) {
             @Override
@@ -70,42 +66,38 @@ public class OpendaylightFlowStatisticsServiceImpl2Test extends AbstractStatsSer
                 //NOOP
             }
         };
-        Mockito.when(rqContextStack.<List<MultipartReply>>createRequestContext()).thenReturn(rqContextMp);
-        Mockito.when(translatorLibrary
-                .<MultipartReply, AggregatedFlowStatistics>lookupTranslator(Mockito.any()))
+        when(rqContextStack.<List<MultipartReply>>createRequestContext()).thenReturn(rqContextMp);
+        when(translatorLibrary.<MultipartReply, AggregatedFlowStatistics>lookupTranslator(any()))
                 .thenReturn(translator);
     }
 
     @Test
     public void testGetAggregateFlowStatisticsFromFlowTableForGivenMatch() throws Exception {
-        Mockito.doAnswer(answerVoidToCallback).when(outboundQueueProvider)
-                .commitEntry(eq(Uint32.valueOf(42)), requestInput.capture(), Mockito.<FutureCallback>any());
-        Mockito.doAnswer((Answer<Void>) invocation -> {
-            final MultipartReplyMessageBuilder messageBuilder = new MultipartReplyMessageBuilder()
-                    .setVersion(EncodeConstants.OF_VERSION_1_3);
+        doAnswer(answerVoidToCallback).when(outboundQueueProvider)
+                .commitEntry(eq(Uint32.valueOf(42)), requestInput.capture(), any());
+        doAnswer((Answer<Void>) invocation -> {
+            final var messageBuilder = new MultipartReplyMessageBuilder().setVersion(EncodeConstants.OF_VERSION_1_3);
 
             rqContextMp.setResult(RpcResultBuilder
                     .success(Collections.<MultipartReply>singletonList(messageBuilder.build()))
                     .build());
             return null;
-        }).when(multiMsgCollector).endCollecting(Mockito.any());
-        Mockito.when(translator.translate(
-                        Mockito.any(), same(deviceInfo), isNull())
-        ).thenReturn(new AggregatedFlowStatisticsBuilder().build());
+        }).when(multiMsgCollector).endCollecting(any());
+        when(translator.translate(any(), same(deviceInfo), isNull()))
+            .thenReturn(new AggregatedFlowStatisticsBuilder().build());
 
-        GetAggregateFlowStatisticsFromFlowTableForGivenMatchInputBuilder input =
+        final var input =
                 new GetAggregateFlowStatisticsFromFlowTableForGivenMatchInputBuilder()
                         .setNode(createNodeRef("unitProt:123"))
                         .setPriority(Uint16.valueOf(5))
                         .setTableId(Uint8.ONE);
 
-        final Future<RpcResult<GetAggregateFlowStatisticsFromFlowTableForGivenMatchOutput>> resultFuture
-                = flowStatisticsService.getAggregateFlowStatisticsFromFlowTableForGivenMatch(input.build());
+        final var resultFuture = getAggregateFlowStatisticsFromFlowTableForGivenMatch.invoke(input.build());
 
-        Assert.assertTrue(resultFuture.isDone());
-        final RpcResult<GetAggregateFlowStatisticsFromFlowTableForGivenMatchOutput> rpcResult = resultFuture.get();
-        Assert.assertTrue(rpcResult.isSuccessful());
-        Assert.assertEquals(1, rpcResult.getResult().getAggregatedFlowStatistics().size());
-        Assert.assertEquals(MultipartType.OFPMPAGGREGATE, requestInput.getValue().getType());
+        assertTrue(resultFuture.isDone());
+        final var rpcResult = resultFuture.get();
+        assertTrue(rpcResult.isSuccessful());
+        assertEquals(1, rpcResult.getResult().getAggregatedFlowStatistics().size());
+        assertEquals(MultipartType.OFPMPAGGREGATE, requestInput.getValue().getType());
     }
 }
\ No newline at end of file