Merge "Fix issues related to checkstyle enforcement on openflow-impl module"

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

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImplTest.java
index 77e2299eb98c9bdedb5837b49d77f3fa251cb3ad..cebe9bfb2c0cbccbeaeab6b7c13a0b29c69ce0d6 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImplTest.java
@@ -15,6 +15,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.MoreExecutors;
 import java.util.Collections;
 import org.junit.Assert;
 import org.junit.Before;
@@ -53,11 +54,11 @@ public class StatisticsContextImplTest extends StatisticsContextImpMockInitiatio
     }
 
     private void initStatisticsContext() {
-        statisticsContext = new StatisticsContextImpl<>(
-                mockedDeviceContext, convertorManager,
-                MultipartWriterProviderFactory.createDefaultProvider(mockedDeviceContext),
-                true,
-                false, 3000, 50000);
+        statisticsContext = new StatisticsContextImpl<>(mockedDeviceContext, convertorManager,
+                                                        MultipartWriterProviderFactory
+                                                                .createDefaultProvider(mockedDeviceContext),
+                                                        MoreExecutors.newDirectExecutorService(), true, false, 3000,
+                                                        50000);
 
         statisticsContext.setStatisticsGatheringService(mockedStatisticsGatheringService);
         statisticsContext.setStatisticsGatheringOnTheFlyService(mockedStatisticsOnFlyGatheringService);
@@ -72,14 +73,20 @@ public class StatisticsContextImplTest extends StatisticsContextImpMockInitiatio
     }
 
     /**
-     * There is nothing to check in close method
+     * There is nothing to check in close method.
      */
     @Test
+    @SuppressWarnings("checkstyle:IllegalCatch")
     public void testClose() throws Exception {
-        final StatisticsContextImpl<MultipartReply> statisticsContext = new StatisticsContextImpl<>(
-                mockedDeviceContext, convertorManager,
-                MultipartWriterProviderFactory.createDefaultProvider(mockedDeviceContext),
-                true, false, 3000, 50000);
+        final StatisticsContextImpl<MultipartReply> statisticsContext =
+                new StatisticsContextImpl<>(mockedDeviceContext,
+                                            convertorManager,
+                                            MultipartWriterProviderFactory
+                                                    .createDefaultProvider(mockedDeviceContext),
+                                            MoreExecutors.newDirectExecutorService(),
+                                            true,
+                                            false,
+                                            3000,50000);
 
         final RequestContext<Object> requestContext = statisticsContext.createRequestContext();
         statisticsContext.close();
@@ -112,18 +119,14 @@ public class StatisticsContextImplTest extends StatisticsContextImpMockInitiatio
         when(mockedDeviceInfo.getNodeInstanceIdentifier()).thenReturn(DUMMY_NODE_ID);
         initStatisticsContext();
 
-        when(mockedStatisticsGatheringService.getStatisticsOfType(Matchers.any(EventIdentifier.class),
-                    Matchers.any(MultipartType.class)))
-                .thenReturn(
-                        Futures.immediateFuture(RpcResultBuilder.success(Collections.<MultipartReply>emptyList())
-                            .build())
-                );
-        when(mockedStatisticsOnFlyGatheringService.getStatisticsOfType(Matchers.any(EventIdentifier.class),
-                    Matchers.any(MultipartType.class)))
-                .thenReturn(
-                        Futures.immediateFuture(RpcResultBuilder.success(Collections.<MultipartReply>emptyList())
-                            .build())
-                );
+        when(mockedStatisticsGatheringService
+                     .getStatisticsOfType(Matchers.any(EventIdentifier.class), Matchers.any(MultipartType.class)))
+                .thenReturn(Futures.immediateFuture(
+                        RpcResultBuilder.success(Collections.<MultipartReply>emptyList()).build()));
+        when(mockedStatisticsOnFlyGatheringService
+                     .getStatisticsOfType(Matchers.any(EventIdentifier.class), Matchers.any(MultipartType.class)))
+                .thenReturn(Futures.immediateFuture(
+                        RpcResultBuilder.success(Collections.<MultipartReply>emptyList()).build()));
 
         statisticsContext.registerMastershipWatcher(mockedMastershipWatcher);
         statisticsContext.setStatisticsGatheringService(mockedStatisticsGatheringService);