Migrated to odlparent 4.0.2 and mdsal 3.0.2

[unimgr.git] / cisco-xr-driver / src / test / java / org / opendaylight / unimgr / mef / nrp / cisco / xr / l2vpn / activator / L2vpnP2pConnectionActivatorTest.java

diff --git a/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnP2pConnectionActivatorTest.java b/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnP2pConnectionActivatorTest.java
index 9c311a365811e1fe2c35229d3af5149c06c6c1c1..353c403ace9a20b4c88ac0be0eea4bfeb53df39d 100644 (file)
--- a/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnP2pConnectionActivatorTest.java
+++ b/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnP2pConnectionActivatorTest.java
@@ -57,9 +57,9 @@ public class L2vpnP2pConnectionActivatorTest extends AbstractConcurrentDataBroke
         //given
         //given
         MountPoint mp = Mockito.mock(MountPoint.class);
-        Mockito.when(mp.getService(DataBroker.class)).thenReturn(com.google.common.base.Optional.of(getDataBroker()));
+        Mockito.when(mp.getService(DataBroker.class)).thenReturn(Optional.of(getDataBroker()));
         mountService = Mockito.mock(MountPointService.class);
-        Mockito.when(mountService.getMountPoint(Mockito.any())).thenReturn(com.google.common.base.Optional.of(mp));
+        Mockito.when(mountService.getMountPoint(Mockito.any())).thenReturn(Optional.of(mp));
         l2VpnP2PConnectActivator = new L2vpnP2pConnectActivator(getDataBroker(), mountService);
 
         mtu = Long.valueOf(1500);