Code Review
/
mdsal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix lead transaction cancellation
[mdsal.git]
/
dom
/
mdsal-dom-spi
/
src
/
test
/
java
/
org
/
opendaylight
/
mdsal
/
dom
/
spi
/
PingPongTransactionChainTest.java
diff --git
a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/PingPongTransactionChainTest.java
b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/PingPongTransactionChainTest.java
index ee916f53be2a9aa3d87fa1947813a22854573cb3..a33f4929496bc6a95e73f929a96d9db386ed13d8 100644
(file)
--- a/
dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/PingPongTransactionChainTest.java
+++ b/
dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/PingPongTransactionChainTest.java
@@
-11,7
+11,6
@@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doNothing;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doNothing;
@@
-199,15
+198,9
@@
public class PingPongTransactionChainTest {
private void assertSimpleCancel(final boolean result) {
final var tx = pingPong.newWriteOnlyTransaction();
private void assertSimpleCancel(final boolean result) {
final var tx = pingPong.newWriteOnlyTransaction();
- doNothing().when(chain).close();
doReturn(result).when(rwTx).cancel();
doReturn(result).when(rwTx).cancel();
- doReturn("mock").when(rwTx).toString();
-
- // FIXME: it seems we are doing the wrong, we should see 'result' returned here
- assertTrue(tx.cancel());
-
+ assertEquals(result, tx.cancel());
verify(rwTx).cancel();
verify(rwTx).cancel();
- verify(chain).close();
}
private static <T> T assertDone(final FluentFuture<T> future) {
}
private static <T> T assertDone(final FluentFuture<T> future) {