import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.same;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import akka.actor.ActorRef;
+import java.util.Optional;
import org.junit.Before;
import org.junit.Test;
import org.opendaylight.controller.cluster.access.commands.ModifyTransactionRequestBuilder;
import org.opendaylight.controller.cluster.access.concepts.RequestException;
import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification;
public class FrontendReadWriteTransactionTest {
shardTransaction = new ReadWriteShardDataTreeTransaction(mockParent, TX_ID, mockModification);
openTx = FrontendReadWriteTransaction.createOpen(mockHistory, shardTransaction);
- when(mockParent.finishTransaction(same(shardTransaction))).thenReturn(mockCohort);
+ when(mockParent.finishTransaction(same(shardTransaction), eq(Optional.empty()))).thenReturn(mockCohort);
}
private TransactionSuccess<?> handleRequest(final TransactionRequest<?> request) throws RequestException {
final TransactionRequest<?> readyReq = b.build();
assertNotNull(handleRequest(readyReq));
- verify(mockParent).finishTransaction(same(shardTransaction));
+ verify(mockParent).finishTransaction(same(shardTransaction), eq(Optional.empty()));
assertNotNull(handleRequest(readyReq));
verifyNoMoreInteractions(mockParent);
final TransactionRequest<?> readyReq = b.build();
assertNull(handleRequest(readyReq));
- verify(mockParent).finishTransaction(same(shardTransaction));
+ verify(mockParent).finishTransaction(same(shardTransaction), eq(Optional.empty()));
assertNull(handleRequest(readyReq));
verifyNoMoreInteractions(mockParent);
final TransactionRequest<?> readyReq = b.build();
assertNull(handleRequest(readyReq));
- verify(mockParent).finishTransaction(same(shardTransaction));
+ verify(mockParent).finishTransaction(same(shardTransaction), eq(Optional.empty()));
assertNull(handleRequest(readyReq));
verifyNoMoreInteractions(mockParent);
final TransactionRequest<?> readyReq = b.build();
assertNotNull(handleRequest(readyReq));
- verify(mockParent).finishTransaction(same(shardTransaction));
+ verify(mockParent).finishTransaction(same(shardTransaction), eq(Optional.empty()));
- handleRequest(new ReadTransactionRequest(TX_ID, 0, mock(ActorRef.class), YangInstanceIdentifier.EMPTY, true));
+ handleRequest(new ReadTransactionRequest(TX_ID, 0, mock(ActorRef.class), YangInstanceIdentifier.empty(), true));
}
@Test(expected = IllegalStateException.class)
final TransactionRequest<?> readyReq = b.build();
assertNotNull(handleRequest(readyReq));
- verify(mockParent).finishTransaction(same(shardTransaction));
+ verify(mockParent).finishTransaction(same(shardTransaction), eq(Optional.empty()));
b.setSequence(1);
b.addModification(mock(TransactionModification.class));
assertNull(handleRequest(abortReq));
verify(mockParent).abortTransaction(same(shardTransaction), any(Runnable.class));
- handleRequest(new ReadTransactionRequest(TX_ID, 0, mock(ActorRef.class), YangInstanceIdentifier.EMPTY, true));
+ handleRequest(new ReadTransactionRequest(TX_ID, 0, mock(ActorRef.class), YangInstanceIdentifier.empty(), true));
}
}