Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix sal-remoterpc-connector dependencies
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
ShardDataTreeMocking.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeMocking.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeMocking.java
index 0e1dd4448ec59d85c4cc096e7b3d5650a6b7fc4c..234c69e011bd05a978d13b6927b418a191fb8cf5 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeMocking.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeMocking.java
@@
-7,8
+7,8
@@
*/
package org.opendaylight.controller.cluster.datastore;
*/
package org.opendaylight.controller.cluster.datastore;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.
Argument
Matchers.any;
+import static org.mockito.
Argument
Matchers.anyBoolean;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.inOrder;
@@
-23,8
+23,8
@@
import org.mockito.InOrder;
import org.mockito.invocation.InvocationOnMock;
import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
import org.opendaylight.controller.cluster.datastore.persisted.CommitTransactionPayload;
import org.mockito.invocation.InvocationOnMock;
import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
import org.opendaylight.controller.cluster.datastore.persisted.CommitTransactionPayload;
-import org.opendaylight.
controller.cluster.raft.protobuff.client.messages.Payload
;
-import org.opendaylight.yangtools.yang.data.
api.schema.tree
.DataTreeCandidate;
+import org.opendaylight.
yangtools.yang.common.Empty
;
+import org.opendaylight.yangtools.yang.data.
tree.api
.DataTreeCandidate;
public final class ShardDataTreeMocking {
public final class ShardDataTreeMocking {
@@
-38,18
+38,18
@@
public final class ShardDataTreeMocking {
}
public static ShardDataTreeCohort immediateCanCommit(final ShardDataTreeCohort cohort) {
}
public static ShardDataTreeCohort immediateCanCommit(final ShardDataTreeCohort cohort) {
- final FutureCallback<
Void
> callback = mockCallback();
- doNothing().when(callback).onSuccess(
null
);
+ final FutureCallback<
Empty
> callback = mockCallback();
+ doNothing().when(callback).onSuccess(
Empty.value()
);
cohort.canCommit(callback);
cohort.canCommit(callback);
- verify(callback).onSuccess(
null
);
+ verify(callback).onSuccess(
Empty.value()
);
verifyNoMoreInteractions(callback);
return cohort;
}
verifyNoMoreInteractions(callback);
return cohort;
}
- public static FutureCallback<
Void
> coordinatedCanCommit(final ShardDataTreeCohort cohort) {
- final FutureCallback<
Void
> callback = mockCallback();
- doNothing().when(callback).onSuccess(
null
);
+ public static FutureCallback<
Empty
> coordinatedCanCommit(final ShardDataTreeCohort cohort) {
+ final FutureCallback<
Empty
> callback = mockCallback();
+ doNothing().when(callback).onSuccess(
Empty.value()
);
doNothing().when(callback).onFailure(any(Throwable.class));
cohort.canCommit(callback);
return callback;
doNothing().when(callback).onFailure(any(Throwable.class));
cohort.canCommit(callback);
return callback;
@@
-103,25
+103,24
@@
public final class ShardDataTreeMocking {
}).when(preCommitCallback).onSuccess(any(DataTreeCandidate.class));
doNothing().when(preCommitCallback).onFailure(any(Throwable.class));
}).when(preCommitCallback).onSuccess(any(DataTreeCandidate.class));
doNothing().when(preCommitCallback).onFailure(any(Throwable.class));
- final FutureCallback<
Void
> canCommit = mockCallback();
+ final FutureCallback<
Empty
> canCommit = mockCallback();
doAnswer(invocation -> {
cohort.preCommit(preCommitCallback);
return null;
doAnswer(invocation -> {
cohort.preCommit(preCommitCallback);
return null;
- }).when(canCommit).onSuccess(
null
);
+ }).when(canCommit).onSuccess(
Empty.value()
);
doNothing().when(canCommit).onFailure(any(Throwable.class));
cohort.canCommit(canCommit);
return commitCallback;
}
doNothing().when(canCommit).onFailure(any(Throwable.class));
cohort.canCommit(canCommit);
return commitCallback;
}
- @SuppressWarnings("unchecked")
private static <T> Object invokeSuccess(final InvocationOnMock invocation, final T value) {
private static <T> Object invokeSuccess(final InvocationOnMock invocation, final T value) {
- invocation.
getArgumentAt(0, FutureCallback.class
).onSuccess(value);
+ invocation.
<FutureCallback<T>>getArgument(0
).onSuccess(value);
return null;
}
private static Object invokeFailure(final InvocationOnMock invocation) {
return null;
}
private static Object invokeFailure(final InvocationOnMock invocation) {
- invocation.
getArgumentAt(0, FutureCallback.class
).onFailure(mock(Exception.class));
+ invocation.
<FutureCallback<?>>getArgument(0
).onFailure(mock(Exception.class));
return null;
}
return null;
}
@@
-183,8
+182,7
@@
public final class ShardDataTreeMocking {
public static void immediatePayloadReplication(final ShardDataTree shardDataTree, final Shard mockShard) {
doAnswer(invocation -> {
public static void immediatePayloadReplication(final ShardDataTree shardDataTree, final Shard mockShard) {
doAnswer(invocation -> {
- shardDataTree.applyReplicatedPayload(invocation.getArgumentAt(0, TransactionIdentifier.class),
- invocation.getArgumentAt(1, Payload.class));
+ shardDataTree.applyReplicatedPayload(invocation.getArgument(0), invocation.getArgument(1));
return null;
}).when(mockShard).persistPayload(any(TransactionIdentifier.class), any(CommitTransactionPayload.class),
anyBoolean());
return null;
}).when(mockShard).persistPayload(any(TransactionIdentifier.class), any(CommitTransactionPayload.class),
anyBoolean());