From 04725a05b665b936cd6483c58079deb87b61c465 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 22 Mar 2019 20:40:03 +0100 Subject: [PATCH] Fix test mocking MD-SAL store APIs require FluentFuture, not CheckedFuture, fix that up. Change-Id: I2222c6a56f8b7a1bcc6569ba84e01ce3b4904a51 Signed-off-by: Robert Varga --- .../core/compat/LegacyDOMDataBrokerAdapterTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/opendaylight/md-sal/sal-dom-compat/src/test/java/org/opendaylight/controller/sal/core/compat/LegacyDOMDataBrokerAdapterTest.java b/opendaylight/md-sal/sal-dom-compat/src/test/java/org/opendaylight/controller/sal/core/compat/LegacyDOMDataBrokerAdapterTest.java index ce375edb19..57a2b356e3 100644 --- a/opendaylight/md-sal/sal-dom-compat/src/test/java/org/opendaylight/controller/sal/core/compat/LegacyDOMDataBrokerAdapterTest.java +++ b/opendaylight/md-sal/sal-dom-compat/src/test/java/org/opendaylight/controller/sal/core/compat/LegacyDOMDataBrokerAdapterTest.java @@ -11,9 +11,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -212,7 +212,7 @@ public class LegacyDOMDataBrokerAdapterTest { String errorMsg = "mock read error"; Throwable cause = new RuntimeException(); - doReturn(Futures.immediateFailedCheckedFuture(new org.opendaylight.mdsal.common.api.ReadFailedException( + doReturn(FluentFutures.immediateFailedFluentFuture(new org.opendaylight.mdsal.common.api.ReadFailedException( errorMsg, cause))).when(mockConfigReadTx).read(TEST_PATH); try { @@ -512,7 +512,7 @@ public class LegacyDOMDataBrokerAdapterTest { } @SuppressWarnings("checkstyle:AvoidHidingCauseException") - private static void commit(DOMDataWriteTransaction tx) + private static void commit(final DOMDataWriteTransaction tx) throws TransactionCommitFailedException, InterruptedException, TimeoutException { try { tx.commit().get(5, TimeUnit.SECONDS); -- 2.36.6