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 / L2vpnLocalConnectionActivatorTest.java

diff --git a/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnLocalConnectionActivatorTest.java b/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnLocalConnectionActivatorTest.java
index ddd68c144578461695db97d84cadffe1dc7b5d6a..265a4724b7274dfba1a0ad6ddcb86a1b670a1d93 100644 (file)
--- a/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnLocalConnectionActivatorTest.java
+++ b/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnLocalConnectionActivatorTest.java
@@ -57,9 +57,9 @@ public class L2vpnLocalConnectionActivatorTest extends AbstractConcurrentDataBro
     public void setUp() {
         //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));
 
         l2VpnLocalConnectActivator = new L2vpnLocalConnectActivator(getDataBroker(),mountService);