X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=applications%2Fforwardingrules-sync%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fapplications%2Ffrsync%2Fimpl%2Fstrategy%2FSyncPlanPushStrategyFlatBatchImplTest.java;h=c6f6a826a0c6d24592c61fefba1e5fda121fa465;hb=13e1d5e6c0237b9378d60526dd8c1d79db6d2b49;hp=4bea89fd48c2f248841135bbdf2ca90ea001b79a;hpb=9ecd75a2cd929871d62695b950f153ce0aa3f0f7;p=openflowplugin.git diff --git a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImplTest.java b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImplTest.java index 4bea89fd48..c6f6a826a0 100644 --- a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImplTest.java +++ b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/SyncPlanPushStrategyFlatBatchImplTest.java @@ -1,11 +1,10 @@ -/** +/* * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * 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.applications.frsync.impl.strategy; import com.google.common.collect.Lists; @@ -20,8 +19,8 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; +import org.mockito.ArgumentMatchers; import org.mockito.Captor; -import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; @@ -62,6 +61,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.N import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; +import org.opendaylight.yangtools.yang.common.Uint16; /** * Test for {@link SyncPlanPushStrategyFlatBatchImpl}. @@ -109,7 +109,7 @@ public class SyncPlanPushStrategyFlatBatchImplTest { @Before - public void setUp() throws Exception { + public void setUp() { syncPlanPushStrategy = new SyncPlanPushStrategyFlatBatchImpl(); syncPlanPushStrategy.setFlatBatchService(flatBatchService); syncPlanPushStrategy.setTableForwarder(tableForwarder); @@ -120,9 +120,10 @@ public class SyncPlanPushStrategyFlatBatchImplTest { @Test public void testExecuteSyncStrategy() throws Exception { final SynchronizationDiffInput diffInput = new SynchronizationDiffInput(NODE_IDENT, - groupsToAddOrUpdate, metersToAddOrUpdate, flowsToAddOrUpdate, flowsToRemove, metersToRemove, groupsToRemove); + groupsToAddOrUpdate, metersToAddOrUpdate, flowsToAddOrUpdate, + flowsToRemove, metersToRemove, groupsToRemove); - Mockito.when(flatBatchService.processFlatBatch(Matchers.any())) + Mockito.when(flatBatchService.processFlatBatch(ArgumentMatchers.any())) .thenReturn(RpcResultBuilder.success(new ProcessFlatBatchOutputBuilder().build()).buildFuture()); final SyncCrudCounters counters = new SyncCrudCounters(); @@ -152,94 +153,97 @@ public class SyncPlanPushStrategyFlatBatchImplTest { } @Test - public void testAssembleRemoveFlows() throws Exception { + public void testAssembleRemoveFlows() { final int lastOrder = SyncPlanPushStrategyFlatBatchImpl.assembleRemoveFlows(batchBag, 0, flowsToRemove); Assert.assertEquals(6, lastOrder); Assert.assertEquals(2, batchBag.size()); - Assert.assertEquals(FlatBatchRemoveFlowCase.class, batchBag.get(0).getBatchChoice().getImplementedInterface()); + Assert.assertEquals(FlatBatchRemoveFlowCase.class, batchBag.get(0).getBatchChoice().implementedInterface()); Assert.assertEquals(3, ((FlatBatchRemoveFlowCase) batchBag.get(0).getBatchChoice()) .getFlatBatchRemoveFlow().size()); - Assert.assertEquals(FlatBatchRemoveFlowCase.class, batchBag.get(1).getBatchChoice().getImplementedInterface()); + Assert.assertEquals(FlatBatchRemoveFlowCase.class, batchBag.get(1).getBatchChoice().implementedInterface()); Assert.assertEquals(3, ((FlatBatchRemoveFlowCase) batchBag.get(1).getBatchChoice()) .getFlatBatchRemoveFlow().size()); } @Test - public void testAssembleAddOrUpdateGroups() throws Exception { - final int lastOrder = SyncPlanPushStrategyFlatBatchImpl.assembleAddOrUpdateGroups(batchBag, 0, groupsToAddOrUpdate); + public void testAssembleAddOrUpdateGroups() { + final int lastOrder = SyncPlanPushStrategyFlatBatchImpl.assembleAddOrUpdateGroups( + batchBag, 0, groupsToAddOrUpdate); Assert.assertEquals(9, lastOrder); Assert.assertEquals(3, batchBag.size()); - Assert.assertEquals(FlatBatchAddGroupCase.class, batchBag.get(0).getBatchChoice().getImplementedInterface()); + Assert.assertEquals(FlatBatchAddGroupCase.class, batchBag.get(0).getBatchChoice().implementedInterface()); Assert.assertEquals(3, ((FlatBatchAddGroupCase) batchBag.get(0).getBatchChoice()) .getFlatBatchAddGroup().size()); - Assert.assertEquals(FlatBatchAddGroupCase.class, batchBag.get(1).getBatchChoice().getImplementedInterface()); + Assert.assertEquals(FlatBatchAddGroupCase.class, batchBag.get(1).getBatchChoice().implementedInterface()); Assert.assertEquals(3, ((FlatBatchAddGroupCase) batchBag.get(1).getBatchChoice()) .getFlatBatchAddGroup().size()); - Assert.assertEquals(FlatBatchUpdateGroupCase.class, batchBag.get(2).getBatchChoice().getImplementedInterface()); + Assert.assertEquals(FlatBatchUpdateGroupCase.class, batchBag.get(2).getBatchChoice().implementedInterface()); Assert.assertEquals(3, ((FlatBatchUpdateGroupCase) batchBag.get(2).getBatchChoice()) .getFlatBatchUpdateGroup().size()); } @Test - public void testAssembleRemoveGroups() throws Exception { + public void testAssembleRemoveGroups() { final int lastOrder = SyncPlanPushStrategyFlatBatchImpl.assembleRemoveGroups(batchBag, 0, groupsToRemove); Assert.assertEquals(6, lastOrder); Assert.assertEquals(2, batchBag.size()); - Assert.assertEquals(FlatBatchRemoveGroupCase.class, batchBag.get(0).getBatchChoice().getImplementedInterface()); + Assert.assertEquals(FlatBatchRemoveGroupCase.class, batchBag.get(0).getBatchChoice().implementedInterface()); Assert.assertEquals(3, ((FlatBatchRemoveGroupCase) batchBag.get(0).getBatchChoice()) .getFlatBatchRemoveGroup().size()); - Assert.assertEquals(FlatBatchRemoveGroupCase.class, batchBag.get(1).getBatchChoice().getImplementedInterface()); + Assert.assertEquals(FlatBatchRemoveGroupCase.class, batchBag.get(1).getBatchChoice().implementedInterface()); Assert.assertEquals(3, ((FlatBatchRemoveGroupCase) batchBag.get(1).getBatchChoice()) .getFlatBatchRemoveGroup().size()); } @Test - public void testAssembleAddOrUpdateMeters() throws Exception { - final int lastOrder = SyncPlanPushStrategyFlatBatchImpl.assembleAddOrUpdateMeters(batchBag, 0, metersToAddOrUpdate); + public void testAssembleAddOrUpdateMeters() { + final int lastOrder = SyncPlanPushStrategyFlatBatchImpl.assembleAddOrUpdateMeters( + batchBag, 0, metersToAddOrUpdate); Assert.assertEquals(6, lastOrder); Assert.assertEquals(2, batchBag.size()); - Assert.assertEquals(FlatBatchAddMeterCase.class, batchBag.get(0).getBatchChoice().getImplementedInterface()); + Assert.assertEquals(FlatBatchAddMeterCase.class, batchBag.get(0).getBatchChoice().implementedInterface()); Assert.assertEquals(3, ((FlatBatchAddMeterCase) batchBag.get(0).getBatchChoice()) .getFlatBatchAddMeter().size()); - Assert.assertEquals(FlatBatchUpdateMeterCase.class, batchBag.get(1).getBatchChoice().getImplementedInterface()); + Assert.assertEquals(FlatBatchUpdateMeterCase.class, batchBag.get(1).getBatchChoice().implementedInterface()); Assert.assertEquals(3, ((FlatBatchUpdateMeterCase) batchBag.get(1).getBatchChoice()) .getFlatBatchUpdateMeter().size()); } @Test - public void testAssembleRemoveMeters() throws Exception { + public void testAssembleRemoveMeters() { final int lastOrder = SyncPlanPushStrategyFlatBatchImpl.assembleRemoveMeters(batchBag, 0, metersToRemove); Assert.assertEquals(3, lastOrder); Assert.assertEquals(1, batchBag.size()); - Assert.assertEquals(FlatBatchRemoveMeterCase.class, batchBag.get(0).getBatchChoice().getImplementedInterface()); + Assert.assertEquals(FlatBatchRemoveMeterCase.class, batchBag.get(0).getBatchChoice().implementedInterface()); Assert.assertEquals(3, ((FlatBatchRemoveMeterCase) batchBag.get(0).getBatchChoice()) .getFlatBatchRemoveMeter().size()); } @Test - public void testAssembleAddOrUpdateFlows() throws Exception { - final int lastOrder = SyncPlanPushStrategyFlatBatchImpl.assembleAddOrUpdateFlows(batchBag, 0, flowsToAddOrUpdate); + public void testAssembleAddOrUpdateFlows() { + final int lastOrder = SyncPlanPushStrategyFlatBatchImpl.assembleAddOrUpdateFlows( + batchBag, 0, flowsToAddOrUpdate); Assert.assertEquals(9, lastOrder); Assert.assertEquals(3, batchBag.size()); - Assert.assertEquals(FlatBatchAddFlowCase.class, batchBag.get(0).getBatchChoice().getImplementedInterface()); + Assert.assertEquals(FlatBatchAddFlowCase.class, batchBag.get(0).getBatchChoice().implementedInterface()); Assert.assertEquals(3, ((FlatBatchAddFlowCase) batchBag.get(0).getBatchChoice()) .getFlatBatchAddFlow().size()); - Assert.assertEquals(FlatBatchUpdateFlowCase.class, batchBag.get(1).getBatchChoice().getImplementedInterface()); + Assert.assertEquals(FlatBatchUpdateFlowCase.class, batchBag.get(1).getBatchChoice().implementedInterface()); Assert.assertEquals(3, ((FlatBatchUpdateFlowCase) batchBag.get(1).getBatchChoice()) .getFlatBatchUpdateFlow().size()); - Assert.assertEquals(FlatBatchAddFlowCase.class, batchBag.get(2).getBatchChoice().getImplementedInterface()); + Assert.assertEquals(FlatBatchAddFlowCase.class, batchBag.get(2).getBatchChoice().implementedInterface()); Assert.assertEquals(3, ((FlatBatchAddFlowCase) batchBag.get(2).getBatchChoice()) .getFlatBatchAddFlow().size()); } @Test - public void testDecrementCounters() throws Exception { + public void testDecrementCounters() { final SyncCrudCounters counters = new SyncCrudCounters(); counters.getFlowCrudCounts().setAdded(100); counters.getFlowCrudCounts().setUpdated(100); @@ -279,24 +283,25 @@ public class SyncPlanPushStrategyFlatBatchImplTest { } @Test - public void testMapBatchesToRanges() throws Exception { + public void testMapBatchesToRanges() { final List inputBatchBag = Lists.newArrayList( new BatchBuilder().setBatchOrder(0).build(), new BatchBuilder().setBatchOrder(5).build(), new BatchBuilder().setBatchOrder(9).build(), new BatchBuilder().setBatchOrder(15).build() ); - final Map, Batch> rangeBatchMap = SyncPlanPushStrategyFlatBatchImpl.mapBatchesToRanges(inputBatchBag, 42); + final Map, Batch> rangeBatchMap = + SyncPlanPushStrategyFlatBatchImpl.mapBatchesToRanges(inputBatchBag, 42); Assert.assertEquals(4, rangeBatchMap.size()); int idx = 0; final int[] lower = new int[]{0, 5, 9, 15}; final int[] upper = new int[]{4, 8, 14, 41}; - for (Map.Entry, Batch> rangeBatchEntry : rangeBatchMap.entrySet()) { + for (Map.Entry, Batch> rangeBatchEntry : rangeBatchMap.entrySet()) { Assert.assertEquals(lower[idx], rangeBatchEntry.getKey().lowerEndpoint().intValue()); Assert.assertEquals(upper[idx], rangeBatchEntry.getKey().upperEndpoint().intValue()); Assert.assertSame(inputBatchBag.get(idx), rangeBatchEntry.getValue()); idx++; } } -} \ No newline at end of file +}