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.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import scala.concurrent.Await;
import scala.concurrent.Future;
-import scala.concurrent.duration.Duration;
+import scala.concurrent.duration.FiniteDuration;
/**
* Abstract base for shard unit tests.
Props.create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()),
"testRecovery");
- assertEquals("Recovery complete", true, recoveryComplete.await(5, TimeUnit.SECONDS));
+ assertTrue("Recovery complete", recoveryComplete.await(5, TimeUnit.SECONDS));
// Verify data in the data store.
final DataTree mock = mock(DataTree.class);
doAnswer(invocation -> {
- actual.validate(invocation.getArgumentAt(0, DataTreeModification.class));
+ actual.validate(invocation.getArgument(0));
return null;
}).when(mock).validate(any(DataTreeModification.class));
- doAnswer(invocation -> actual.prepare(invocation.getArgumentAt(0, DataTreeModification.class))).when(
+ doAnswer(invocation -> actual.prepare(invocation.getArgument(0))).when(
mock).prepare(any(DataTreeModification.class));
doAnswer(invocation -> {
- actual.commit(invocation.getArgumentAt(0, DataTreeCandidate.class));
+ actual.commit(invocation.getArgument(0));
return null;
}).when(mock).commit(any(DataTreeCandidate.class));
doAnswer(invocation -> {
- actual.setSchemaContext(invocation.getArgumentAt(0, SchemaContext.class));
+ actual.setSchemaContext(invocation.getArgument(0));
return null;
}).when(mock).setSchemaContext(any(SchemaContext.class));
}
public static NormalizedNode<?,?> readStore(final TestActorRef<? extends Shard> shard,
- final YangInstanceIdentifier id) throws ExecutionException, InterruptedException {
+ final YangInstanceIdentifier id) {
return shard.underlyingActor().getDataStore().readNode(id).orNull();
}
Future<Object> future = Patterns.ask(shard, newBatchedModifications(nextTransactionId(),
id, node, true, true, 1), new Timeout(5, TimeUnit.SECONDS));
try {
- Await.ready(future, Duration.create(5, TimeUnit.SECONDS));
+ Await.ready(future, FiniteDuration.create(5, TimeUnit.SECONDS));
} catch (TimeoutException e) {
throw new ExecutionException(e);
}
}
@SuppressWarnings("unchecked")
- static void verifyOuterListEntry(final TestActorRef<Shard> shard, final Object expIDValue) throws Exception {
+ static void verifyOuterListEntry(final TestActorRef<Shard> shard, final Object expIDValue) {
final NormalizedNode<?, ?> outerList = readStore(shard, TestModel.OUTER_LIST_PATH);
assertNotNull(TestModel.OUTER_LIST_QNAME.getLocalName() + " not found", outerList);
assertTrue(TestModel.OUTER_LIST_QNAME.getLocalName() + " value is not Iterable",
private static <T> FutureCallback<T> mockFutureCallback(final FutureCallback<T> actual) {
FutureCallback<T> mock = mock(FutureCallback.class);
doAnswer(invocation -> {
- actual.onFailure(invocation.getArgumentAt(0, Throwable.class));
+ actual.onFailure(invocation.getArgument(0));
return null;
}).when(mock).onFailure(any(Throwable.class));
doAnswer(invocation -> {
- actual.onSuccess((T) invocation.getArgumentAt(0, Throwable.class));
+ actual.onSuccess(invocation.getArgument(0));
return null;
- }).when(mock).onSuccess((T) any(Object.class));
+ }).when(mock).onSuccess((T) nullable(Object.class));
return mock;
}