X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fimpl%2Fdevice%2FDeviceManagerImplTest.java;h=a0bf7482d8b0b813fd09cceb0f1936567a2100f1;hb=cfe3a97837951ebbedb337dc988027f10c49f714;hp=dd106cbb330e8031cdf9631334d3b60453f8d282;hpb=6916d4f22823d56b391d0d45cb8544260def3431;p=openflowplugin.git diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImplTest.java index dd106cbb33..a0bf7482d8 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImplTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImplTest.java @@ -5,23 +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.device; 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.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.google.common.util.concurrent.CheckedFuture; -import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.ListenableFuture; import io.netty.util.HashedWheelTimer; import java.lang.reflect.Field; -import java.math.BigInteger; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutionException; import org.junit.Assert; @@ -30,14 +28,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; -import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; -import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; +import org.mockito.junit.MockitoJUnitRunner; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.NotificationPublishService; +import org.opendaylight.mdsal.binding.api.TransactionChain; +import org.opendaylight.mdsal.binding.api.WriteTransaction; +import org.opendaylight.mdsal.common.api.CommitInfo; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.mdsal.common.api.TransactionCommitFailedException; import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter; import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext; import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext; @@ -59,6 +57,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.NonZeroUint16Type; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.NonZeroUint32Type; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.OpenflowProviderConfigBuilder; +import org.opendaylight.yangtools.util.concurrent.FluentFutures; import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; @RunWith(MockitoJUnitRunner.class) @@ -72,7 +71,7 @@ public class DeviceManagerImplTest { .createNodeInstanceIdentifier(DUMMY_NODE_ID); @Mock - private CheckedFuture mockedFuture; + private FluentFuture mockedFuture; @Mock private FeaturesReply mockFeatures; @Mock @@ -92,7 +91,7 @@ public class DeviceManagerImplTest { @Mock private WriteTransaction writeTransaction; @Mock - private BindingTransactionChain transactionChain; + private TransactionChain transactionChain; @Mock private Capabilities capabilities; @Mock @@ -106,22 +105,14 @@ public class DeviceManagerImplTest { @Before public void setUp() throws Exception { - when(mockConnectionContext.getNodeId()).thenReturn(DUMMY_NODE_ID); when(mockConnectionContext.getFeatures()).thenReturn(mockFeatures); when(mockConnectionContext.getConnectionAdapter()).thenReturn(mockedConnectionAdapter); when(mockConnectionContext.getDeviceInfo()).thenReturn(deviceInfo); - when(mockedDeviceContext.getPrimaryConnectionContext()).thenReturn(mockConnectionContext); when(deviceInfo.getNodeInstanceIdentifier()).thenReturn(DUMMY_IDENTIFIER); when(deviceInfo.getNodeId()).thenReturn(DUMMY_NODE_ID); - when(mockFeatures.getCapabilities()).thenReturn(capabilities); - when(mockFeatures.getCapabilitiesV10()).thenReturn(capabilitiesV10); - when(mockFeatures.getDatapathId()).thenReturn(BigInteger.valueOf(21L)); - when(mockedFuture.isDone()).thenReturn(true); - when(writeTransaction.submit()).thenReturn(mockedFuture); - when(transactionChain.newWriteOnlyTransaction()).thenReturn(writeTransaction); - when(dataBroker.createTransactionChain(any(TransactionChainListener.class))).thenReturn(transactionChain); + doReturn(mockedFuture).when(writeTransaction).commit(); when(dataBroker.newWriteOnlyTransaction()).thenReturn(writeTransaction); deviceManager = new DeviceManagerImpl( @@ -144,7 +135,7 @@ public class DeviceManagerImplTest { deviceManager.setTranslatorLibrary(translatorLibrary); verify(dataBroker).newWriteOnlyTransaction(); verify(writeTransaction).merge(eq(LogicalDatastoreType.OPERATIONAL), any(), any()); - verify(writeTransaction).submit(); + verify(writeTransaction).commit(); } @Test @@ -156,7 +147,7 @@ public class DeviceManagerImplTest { @Test public void removeDeviceFromOperationalDS() throws Exception { - final ListenableFuture future = deviceManager + final ListenableFuture future = deviceManager .removeDeviceFromOperationalDS(DUMMY_IDENTIFIER); future.get(); @@ -166,12 +157,10 @@ public class DeviceManagerImplTest { @Test(expected = ExecutionException.class) public void removeDeviceFromOperationalDSException() throws Exception { - final CheckedFuture failedFuture = - Futures.immediateFailedCheckedFuture( + final FluentFuture failedFuture = FluentFutures.immediateFailedFluentFuture( new TransactionCommitFailedException("Test failed transaction")); - Mockito.when(writeTransaction.submit()).thenReturn(failedFuture); - final ListenableFuture future = deviceManager - .removeDeviceFromOperationalDS(DUMMY_IDENTIFIER); + Mockito.doReturn(failedFuture).when(writeTransaction).commit(); + final ListenableFuture future = deviceManager.removeDeviceFromOperationalDS(DUMMY_IDENTIFIER); future.get(); assertTrue(future.isDone()); verify(writeTransaction).delete(LogicalDatastoreType.OPERATIONAL, DUMMY_IDENTIFIER);