*/
package org.opendaylight.openflowplugin.impl.services.sal;
-import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.util.concurrent.Future;
import org.junit.Assert;
import org.junit.Test;
-import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.stubbing.Answer;
import org.opendaylight.yang.gen.v1.urn.opendaylight.table.service.rev131026.table.update.UpdatedTableBuilder;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint8;
public class SalTableServiceImplTest extends ServiceMocking {
final FutureCallback<OfHeader> callback = (FutureCallback<OfHeader>) invocation.getArguments()[2];
callback.onSuccess(null);
return null;
- })
- .when(mockedOutboundQueue).commitEntry(
- anyLong(), ArgumentMatchers.any(), ArgumentMatchers.any());
+ }).when(mockedOutboundQueue).commitEntry(any(Uint32.class), any(), any());
final ConvertorManager convertorManager = ConvertorManagerFactory.createDefaultManager();
salTableService = new SalTableServiceImpl(mockedRequestContextStack, mockedDeviceContext,
RpcResultBuilder.<List<MultipartReply>>failed().build();
handleResultFuture.set(rpcResult);
return null;
- }).when(multiMessageCollector).endCollecting(ArgumentMatchers.any());
+ }).when(multiMessageCollector).endCollecting(any());
final Future<RpcResult<UpdateTableOutput>> rpcResultFuture = salTableService.updateTable(prepareUpdateTable());
Assert.assertNotNull(rpcResultFuture);
.build();
handleResultFuture.set(rpcResult);
return null;
- }).when(multiMessageCollector).endCollecting(ArgumentMatchers.any());
+ }).when(multiMessageCollector).endCollecting(any());
final Future<RpcResult<UpdateTableOutput>> rpcResultFuture = salTableService.updateTable(prepareUpdateTable());
Assert.assertNotNull(rpcResultFuture);
public void testUpdateTableSuccess() {
Mockito.doAnswer((Answer<Void>) invocation -> {
TableFeaturesBuilder tableFeaturesBld = new TableFeaturesBuilder()
- .setTableId((short) 0)
+ .setTableId(Uint8.ZERO)
.setName("Zafod")
- .setMaxEntries(42L)
+ .setMaxEntries(Uint32.valueOf(42))
.setTableFeatureProperties(Collections.emptyList());
MultipartReplyTableFeaturesBuilder mpTableFeaturesBld = new MultipartReplyTableFeaturesBuilder()
.setTableFeatures(Collections.singletonList(tableFeaturesBld.build()));
MultipartReplyMessageBuilder mpResultBld = new MultipartReplyMessageBuilder()
.setType(MultipartType.OFPMPTABLEFEATURES)
.setMultipartReplyBody(mpBodyBld.build())
- .setXid(21L);
+ .setXid(Uint32.valueOf(21));
final RpcResult<List<MultipartReply>> rpcResult = RpcResultBuilder
.success(Collections.singletonList((MultipartReply) mpResultBld.build()))
.build();
handleResultFuture.set(rpcResult);
return null;
- }).when(multiMessageCollector).endCollecting(ArgumentMatchers.any());
+ }).when(multiMessageCollector).endCollecting(any());
final Future<RpcResult<UpdateTableOutput>> rpcResultFuture = salTableService.updateTable(prepareUpdateTable());
Assert.assertNotNull(rpcResultFuture);
verify(mockedRequestContextStack).createRequestContext();
}
- private UpdateTableInput prepareUpdateTable() {
+ private static UpdateTableInput prepareUpdateTable() {
UpdateTableInputBuilder updateTableInputBuilder = new UpdateTableInputBuilder();
UpdatedTableBuilder updatedTableBuilder = new UpdatedTableBuilder();
- updatedTableBuilder.setTableFeatures(Collections.emptyList());
+ updatedTableBuilder.setTableFeatures(Collections.emptyMap());
updateTableInputBuilder.setUpdatedTable(updatedTableBuilder.build());
return updateTableInputBuilder.build();
}