diff options
author | Michal Cmarada <mcmarada@cisco.com> | 2019-04-08 11:37:45 +0200 |
---|---|---|
committer | Michal Cmarada <mcmarada@cisco.com> | 2019-04-08 11:37:45 +0200 |
commit | b16cea20258ba537db7c0755208c82ab93331ff7 (patch) | |
tree | 8a5a3c87069b9ce700c34323e75ff434e7acae97 /infra/translate-utils/src/test/java/io/fd/honeycomb/translate/util/TransactionMappingContextTest.java | |
parent | 23979469bcf8cd312cb3ec9e9e548003110f68f4 (diff) |
HONEYCOMB-443: ODL bump to Neon
- bumps ODL dependencies to neon
- migrates guava optional to java.utils.optional
Change-Id: Ibdaa365c7e21a341103aba88dfd67277e40d2969
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
Diffstat (limited to 'infra/translate-utils/src/test/java/io/fd/honeycomb/translate/util/TransactionMappingContextTest.java')
-rw-r--r-- | infra/translate-utils/src/test/java/io/fd/honeycomb/translate/util/TransactionMappingContextTest.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/infra/translate-utils/src/test/java/io/fd/honeycomb/translate/util/TransactionMappingContextTest.java b/infra/translate-utils/src/test/java/io/fd/honeycomb/translate/util/TransactionMappingContextTest.java index 2dcee889a..a9747d0af 100644 --- a/infra/translate-utils/src/test/java/io/fd/honeycomb/translate/util/TransactionMappingContextTest.java +++ b/infra/translate-utils/src/test/java/io/fd/honeycomb/translate/util/TransactionMappingContextTest.java @@ -21,16 +21,16 @@ import static org.junit.Assert.assertSame; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.google.common.base.Optional; -import com.google.common.util.concurrent.CheckedFuture; -import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.FluentFuture; +import java.util.Optional; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; +import org.opendaylight.mdsal.binding.api.ReadWriteTransaction; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.mdsal.common.api.ReadFailedException; +import org.opendaylight.yangtools.util.concurrent.FluentFutures; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; @@ -49,27 +49,27 @@ public class TransactionMappingContextTest { MockitoAnnotations.initMocks(this); ctx = new TransactionMappingContext(writeTx); - when(writeTx.submit()).thenReturn(Futures.immediateCheckedFuture(null)); + when(writeTx.commit()).thenReturn(FluentFutures.immediateNullFluentFuture()); } @Test public void testRead() throws Exception { - final CheckedFuture<Optional<DataObject>, ReadFailedException> futureData = - Futures.immediateCheckedFuture(Optional.of((data))); + final FluentFuture<Optional<DataObject>> futureData = FluentFutures.immediateFluentFuture(Optional.of((data))); when(writeTx.read(LogicalDatastoreType.OPERATIONAL, id)).thenReturn(futureData); assertSame(ctx.read(id).get(), data); verify(writeTx).read(LogicalDatastoreType.OPERATIONAL, id); - when(writeTx.read(LogicalDatastoreType.OPERATIONAL, id)).thenReturn(Futures.immediateCheckedFuture(Optional.absent())); + when(writeTx.read(LogicalDatastoreType.OPERATIONAL, id)) + .thenReturn(FluentFutures.immediateFluentFuture(Optional.empty())); assertFalse(ctx.read(id).isPresent()); } @Test(expected = IllegalStateException.class) public void testReadFailure() throws Exception { - final CheckedFuture<Optional<DataObject>, ReadFailedException> futureData = - Futures.immediateFailedCheckedFuture(ex); + final FluentFuture<Optional<DataObject>> futureData = + FluentFutures.immediateFailedFluentFuture(ex); when(writeTx.read(LogicalDatastoreType.OPERATIONAL, id)).thenReturn(futureData); assertSame(ctx.read(id).get(), data); } |