X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fimpl%2Fstatistics%2Fservices%2Fdirect%2Fsinglelayer%2FGroupDirectStatisticsServiceTest.java;h=5087f4b09a4e398ffd5dd15772820113176c26cd;hb=05f8db12159673d0e0a95642fe86e62c14b7dc7b;hp=f2247cc0557759770015eb38ffc7f91f70682c3d;hpb=cf6b0514a275424a426a2da12df2782945bfed51;p=openflowplugin.git diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/GroupDirectStatisticsServiceTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/GroupDirectStatisticsServiceTest.java index f2247cc055..5087f4b09a 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/GroupDirectStatisticsServiceTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/GroupDirectStatisticsServiceTest.java @@ -5,21 +5,21 @@ * 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.direct.singlelayer; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import java.util.Map; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.openflowplugin.api.openflow.device.Xid; import org.opendaylight.openflowplugin.impl.statistics.services.direct.AbstractDirectStatisticsServiceTest; import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetGroupStatisticsInput; @@ -29,17 +29,19 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111. import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupId; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply.GroupStats; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply.GroupStatsBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply.GroupStatsKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.MultipartReply; import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.MultipartReplyBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.MultipartRequest; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType; +import org.opendaylight.yangtools.yang.common.Uint32; public class GroupDirectStatisticsServiceTest extends AbstractDirectStatisticsServiceTest { - static final Long GROUP_NO = 1L; + static final Uint32 GROUP_NO = Uint32.ONE; private GroupDirectStatisticsService service; @Override - public void setUp() throws Exception { + public void setUp() { service = new GroupDirectStatisticsService(requestContextStack, deviceContext, convertorManager, @@ -47,21 +49,21 @@ public class GroupDirectStatisticsServiceTest extends AbstractDirectStatisticsSe } @Override - public void testBuildRequestBody() throws Exception { + public void testBuildRequestBody() { final GetGroupStatisticsInput input = mock(GetGroupStatisticsInput.class); - when(input.getNode()).thenReturn(createNodeRef(NODE_ID)); + lenient().when(input.getNode()).thenReturn(createNodeRef(NODE_ID)); when(input.getGroupId()).thenReturn(new GroupId(GROUP_NO)); final MultipartRequestGroupStats body = (MultipartRequestGroupStats) ((MultipartRequest) service - .buildRequest(new Xid(42L), input)) + .buildRequest(new Xid(Uint32.valueOf(42L)), input)) .getMultipartRequestBody(); assertEquals(GROUP_NO, body.getGroupId().getValue()); } @Override - public void testBuildReply() throws Exception { + public void testBuildReply() { final GroupStats groupStat = new GroupStatsBuilder() .setGroupId(new GroupId(GROUP_NO)) .build(); @@ -75,26 +77,26 @@ public class GroupDirectStatisticsServiceTest extends AbstractDirectStatisticsSe final List input = Collections.singletonList(reply); final GetGroupStatisticsOutput output = service.buildReply(input, true); - assertTrue(output.getGroupStats().size() > 0); + assertTrue(output.nonnullGroupStats().size() > 0); final org.opendaylight.yang.gen.v1.urn - .opendaylight.group.types.rev131018.group.statistics.reply.GroupStats stats = output.getGroupStats().get(0); + .opendaylight.group.types.rev131018.group.statistics.reply.GroupStats stats = + output.nonnullGroupStats().values().iterator().next(); assertEquals(stats.getGroupId().getValue(), GROUP_NO); } @Override - public void testStoreStatistics() throws Exception { + public void testStoreStatistics() { final org.opendaylight.yang.gen.v1.urn .opendaylight.group.types.rev131018.group.statistics.reply.GroupStats stat = mock(org.opendaylight.yang.gen.v1.urn .opendaylight.group.types.rev131018.group.statistics.reply.GroupStats.class); when(stat.getGroupId()).thenReturn(new GroupId(GROUP_NO)); - final List stats = Collections.singletonList(stat); + final Map stats = Collections.singletonMap(stat.key(), stat); final GetGroupStatisticsOutput output = mock(GetGroupStatisticsOutput.class); - when(output.getGroupStats()).thenReturn(stats); + when(output.nonnullGroupStats()).thenReturn(stats); multipartWriterProvider.lookup(MultipartType.OFPMPGROUP).get().write(output, true); verify(deviceContext).writeToTransactionWithParentsSlow(eq(LogicalDatastoreType.OPERATIONAL), any(), any());