import static org.junit.Assert.assertSame;
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.Mockito.doThrow;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import com.google.common.base.Stopwatch;
import com.google.common.base.Throwables;
import com.google.common.util.concurrent.Uninterruptibles;
+import java.time.Duration;
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
shard.tell(new RegisterDataTreeChangeListener(TestModel.TEST_PATH, dclActor, false), testKit.getRef());
- final RegisterDataTreeNotificationListenerReply reply = testKit.expectMsgClass(testKit.duration("3 seconds"),
+ final RegisterDataTreeNotificationListenerReply reply = testKit.expectMsgClass(Duration.ofSeconds(3),
RegisterDataTreeNotificationListenerReply.class);
final String replyPath = reply.getListenerRegistrationPath().toString();
assertTrue("Incorrect reply path: " + replyPath,
writeToStore(shard, path, ImmutableNodes.containerNode(TestModel.TEST_QNAME));
listener.waitForChangeEvents();
+ listener.verifyOnInitialDataEvent();
+
+ final MockDataTreeChangeListener listener2 = new MockDataTreeChangeListener(1);
+ final ActorRef dclActor2 = actorFactory.createActor(DataTreeChangeListenerActor.props(listener2,
+ TestModel.TEST_PATH), "testRegisterDataTreeChangeListener-DataTreeChangeListener2");
+
+ shard.tell(new RegisterDataTreeChangeListener(TestModel.TEST_PATH, dclActor2, false), testKit.getRef());
+
+ testKit.expectMsgClass(Duration.ofSeconds(3), RegisterDataTreeNotificationListenerReply.class);
+
+ listener2.waitForChangeEvents();
+ listener2.verifyNoOnInitialDataEvent();
}
@SuppressWarnings("serial")
public void testDataTreeChangeListenerNotifiedWhenNotTheLeaderOnRegistration() throws Exception {
final CountDownLatch onFirstElectionTimeout = new CountDownLatch(1);
final CountDownLatch onChangeListenerRegistered = new CountDownLatch(1);
- final Creator<Shard> creator = new Creator<Shard>() {
+ final Creator<Shard> creator = new Creator<>() {
boolean firstElectionTimeout = true;
@Override
final ActorRef dclActor = actorFactory.createActor(DataTreeChangeListenerActor.props(listener, path),
"testDataTreeChangeListenerNotifiedWhenNotTheLeaderOnRegistration-DataChangeListener");
- final TestActorRef<Shard> shard = actorFactory.createTestActor(
- Props.create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()),
+ final TestActorRef<Shard> shard = actorFactory.createTestActor(Props.create(Shard.class,
+ new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()),
"testDataTreeChangeListenerNotifiedWhenNotTheLeaderOnRegistration");
final ShardTestKit testKit = new ShardTestKit(getSystem());
assertTrue("Got first ElectionTimeout", onFirstElectionTimeout.await(5, TimeUnit.SECONDS));
shard.tell(new RegisterDataTreeChangeListener(path, dclActor, false), testKit.getRef());
- final RegisterDataTreeNotificationListenerReply reply = testKit.expectMsgClass(testKit.duration("5 seconds"),
+ final RegisterDataTreeNotificationListenerReply reply = testKit.expectMsgClass(Duration.ofSeconds(5),
RegisterDataTreeNotificationListenerReply.class);
assertNotNull("getListenerRegistratioznPath", reply.getListenerRegistrationPath());
shard.tell(FindLeader.INSTANCE, testKit.getRef());
- final FindLeaderReply findLeadeReply = testKit.expectMsgClass(testKit.duration("5 seconds"),
- FindLeaderReply.class);
+ final FindLeaderReply findLeadeReply = testKit.expectMsgClass(Duration.ofSeconds(5), FindLeaderReply.class);
assertFalse("Expected the shard not to be the leader", findLeadeReply.getLeaderActor().isPresent());
onChangeListenerRegistered.countDown();
shard.tell(new CreateTransaction(nextTransactionId(), TransactionType.READ_ONLY.ordinal(),
DataStoreVersions.CURRENT_VERSION).toSerializable(), testKit.getRef());
- final CreateTransactionReply reply = testKit.expectMsgClass(testKit.duration("3 seconds"),
+ final CreateTransactionReply reply = testKit.expectMsgClass(Duration.ofSeconds(3),
CreateTransactionReply.class);
final String path = reply.getTransactionPath().toString();
shard.tell(new CreateTransaction(nextTransactionId(), TransactionType.READ_ONLY.ordinal(),
DataStoreVersions.CURRENT_VERSION).toSerializable(), testKit.getRef());
- final CreateTransactionReply reply = testKit.expectMsgClass(testKit.duration("3 seconds"),
+ final CreateTransactionReply reply = testKit.expectMsgClass(Duration.ofSeconds(3),
CreateTransactionReply.class);
final String path = reply.getTransactionPath().toString();
writeToStore(store, TestModel.TEST_PATH, container);
- final YangInstanceIdentifier root = YangInstanceIdentifier.EMPTY;
+ final YangInstanceIdentifier root = YangInstanceIdentifier.empty();
final NormalizedNode<?,?> expected = readStore(store, root);
final Snapshot snapshot = Snapshot.create(new ShardSnapshotState(new MetadataShardDataTreeSnapshot(expected)),
final CountDownLatch commitLatch = new CountDownLatch(2);
final long timeoutSec = 5;
- final FiniteDuration duration = FiniteDuration.create(timeoutSec, TimeUnit.SECONDS);
- final Timeout timeout = new Timeout(duration);
+ final Duration duration = Duration.ofSeconds(timeoutSec);
+ final Timeout timeout = Timeout.create(duration);
final TestActorRef<Shard> shard = actorFactory.createTestActor(
newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()),
verifyOuterListEntry(shard, 1);
- verifyLastApplied(shard, 5);
+ verifyLastApplied(shard, 3);
}
@Test
ShardTestKit.waitUntilLeader(shard);
final TransactionIdentifier transactionID = nextTransactionId();
- final FiniteDuration duration = testKit.duration("5 seconds");
+ final Duration duration = Duration.ofSeconds(5);
// Send a BatchedModifications to start a transaction.
ShardTestKit.waitUntilLeader(shard);
final TransactionIdentifier transactionID = nextTransactionId();
- final FiniteDuration duration = testKit.duration("5 seconds");
+ final Duration duration = Duration.ofSeconds(5);
// Send a BatchedModifications to start a transaction.
shard.tell(batched, testKit.getRef());
- final Failure failure = testKit.expectMsgClass(testKit.duration("5 seconds"), Failure.class);
+ final Failure failure = testKit.expectMsgClass(Duration.ofSeconds(5), Failure.class);
if (failure != null) {
Throwables.propagateIfPossible(failure.cause(), Exception.class);
BatchedModifications batched = new BatchedModifications(transactionID, CURRENT_VERSION);
batched.addModification(new MergeModification(TestModel.TEST_PATH, invalidData));
shard.tell(batched, testKit.getRef());
- Failure failure = testKit.expectMsgClass(testKit.duration("5 seconds"), akka.actor.Status.Failure.class);
+ Failure failure = testKit.expectMsgClass(Duration.ofSeconds(5), akka.actor.Status.Failure.class);
final Throwable cause = failure.cause();
shard.tell(batched, testKit.getRef());
- failure = testKit.expectMsgClass(testKit.duration("5 seconds"), akka.actor.Status.Failure.class);
+ failure = testKit.expectMsgClass(Duration.ofSeconds(5), akka.actor.Status.Failure.class);
assertEquals("Failure cause", cause, failure.cause());
}
final TransactionIdentifier transactionID1 = new TransactionIdentifier(historyId, 0);
final TransactionIdentifier transactionID2 = new TransactionIdentifier(historyId, 1);
- final FiniteDuration duration = testKit.duration("5 seconds");
+ final Duration duration = Duration.ofSeconds(5);
// Send a BatchedModifications to start a chained write
// transaction and ready it.
shard.tell(new CreateTransaction(transactionID2, TransactionType.READ_ONLY.ordinal(),
DataStoreVersions.CURRENT_VERSION).toSerializable(), testKit.getRef());
- final CreateTransactionReply createReply = testKit.expectMsgClass(testKit.duration("3 seconds"),
+ final CreateTransactionReply createReply = testKit.expectMsgClass(Duration.ofSeconds(3),
CreateTransactionReply.class);
getSystem().actorSelection(createReply.getTransactionPath())
.tell(new ReadData(path, DataStoreVersions.CURRENT_VERSION), testKit.getRef());
- final ReadDataReply readReply = testKit.expectMsgClass(testKit.duration("3 seconds"), ReadDataReply.class);
+ final ReadDataReply readReply = testKit.expectMsgClass(Duration.ofSeconds(3), ReadDataReply.class);
assertEquals("Read node", containerNode, readReply.getNormalizedNode());
// Commit the write transaction.
public void testOnBatchedModificationsWhenNotLeader() {
final AtomicBoolean overrideLeaderCalls = new AtomicBoolean();
final ShardTestKit testKit = new ShardTestKit(getSystem());
- final Creator<Shard> creator = new Creator<Shard>() {
+ final Creator<Shard> creator = new Creator<>() {
private static final long serialVersionUID = 1L;
@Override
}
};
- final TestActorRef<Shard> shard = actorFactory.createTestActor(Props
- .create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()),
+ final TestActorRef<Shard> shard = actorFactory.createTestActor(Props.create(Shard.class,
+ new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()),
"testOnBatchedModificationsWhenNotLeader");
ShardTestKit.waitUntilLeader(shard);
testKit.getRef());
}
- testKit.expectMsgClass(testKit.duration("5 seconds"), CommitTransactionReply.class);
+ testKit.expectMsgClass(Duration.ofSeconds(5), CommitTransactionReply.class);
final NormalizedNode<?, ?> actualNode = readStore(shard, TestModel.TEST_PATH);
assertEquals(TestModel.TEST_QNAME.getLocalName(), containerNode, actualNode);
// Setup a simulated transactions with a mock cohort.
- final FiniteDuration duration = testKit.duration("5 seconds");
+ final Duration duration = Duration.ofSeconds(5);
final TransactionIdentifier transactionID = nextTransactionId();
final NormalizedNode<?, ?> containerNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME);
ShardTestKit.waitUntilLeader(shard);
- final FiniteDuration duration = testKit.duration("5 seconds");
+ final Duration duration = Duration.ofSeconds(5);
final TransactionIdentifier transactionID = nextTransactionId();
if (readWrite) {
// Committed transaction count should increase as usual
assertEquals(1, shardStats.getCommittedTransactionsCount());
- // Commit index should advance as we do not have an empty
- // modification
+ // Commit index should advance 1 to account for disabling metadata
assertEquals(1, shardStats.getCommitIndex());
}
ShardTestKit.waitUntilLeader(shard);
- final FiniteDuration duration = testKit.duration("5 seconds");
- final Timeout timeout = new Timeout(duration);
+ final Duration duration = Duration.ofSeconds(5);
+ final Timeout timeout = Timeout.create(duration);
// Setup 2 simulated transactions with mock cohorts. The first
// one fails in the
// Wait for the 2nd Tx to complete the canCommit phase.
final CountDownLatch latch = new CountDownLatch(1);
- canCommitFuture.onComplete(new OnComplete<Object>() {
+ canCommitFuture.onComplete(new OnComplete<>() {
@Override
public void onComplete(final Throwable failure, final Object resp) {
latch.countDown();
ShardTestKit.waitUntilLeader(shard);
- final FiniteDuration duration = testKit.duration("5 seconds");
- final Timeout timeout = new Timeout(duration);
+ final Duration duration = Duration.ofSeconds(5);
+ final Timeout timeout = Timeout.create(duration);
doThrow(new RuntimeException("mock preCommit failure")).when(dataTree)
.prepare(any(DataTreeModification.class));
// Wait for the 2nd Tx to complete the canCommit phase.
final CountDownLatch latch = new CountDownLatch(1);
- canCommitFuture.onComplete(new OnComplete<Object>() {
+ canCommitFuture.onComplete(new OnComplete<>() {
@Override
public void onComplete(final Throwable failure, final Object resp) {
latch.countDown();
ShardTestKit.waitUntilLeader(shard);
- final FiniteDuration duration = testKit.duration("5 seconds");
+ final Duration duration = Duration.ofSeconds(5);
final TransactionIdentifier transactionID1 = nextTransactionId();
- doThrow(new DataValidationFailedException(YangInstanceIdentifier.EMPTY, "mock canCommit failure"))
+ doThrow(new DataValidationFailedException(YangInstanceIdentifier.empty(), "mock canCommit failure"))
.doNothing().when(dataTree).validate(any(DataTreeModification.class));
shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH,
ShardTestKit.waitUntilLeader(shard);
- doThrow(new DataValidationFailedException(YangInstanceIdentifier.EMPTY, "mock canCommit failure"))
+ doThrow(new DataValidationFailedException(YangInstanceIdentifier.empty(), "mock canCommit failure"))
.doNothing().when(dataTree).validate(any(DataTreeModification.class));
- final FiniteDuration duration = testKit.duration("5 seconds");
+ final Duration duration = Duration.ofSeconds(5);
final TransactionIdentifier transactionID1 = nextTransactionId();
}
};
- final TestActorRef<Shard> shard = actorFactory.createTestActor(Props
- .create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()),
+ final TestActorRef<Shard> shard = actorFactory.createTestActor(Props.create(Shard.class,
+ new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()),
"testAbortWithCommitPending");
ShardTestKit.waitUntilLeader(shard);
- final FiniteDuration duration = testKit.duration("5 seconds");
+ final Duration duration = Duration.ofSeconds(5);
final TransactionIdentifier transactionID = nextTransactionId();
ShardTestKit.waitUntilLeader(shard);
- final FiniteDuration duration = testKit.duration("5 seconds");
+ final Duration duration = Duration.ofSeconds(5);
writeToStore(shard, TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME));
writeToStore(shard, TestModel.OUTER_LIST_PATH,
ShardTestKit.waitUntilLeader(shard);
- final FiniteDuration duration = testKit.duration("5 seconds");
+ final Duration duration = Duration.ofSeconds(5);
final TransactionIdentifier transactionID1 = nextTransactionId();
shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH,
ShardTestKit.waitUntilLeader(shard);
- final FiniteDuration duration = testKit.duration("5 seconds");
+ final Duration duration = Duration.ofSeconds(5);
final ShardDataTree dataStore = shard.underlyingActor().getDataStore();
"testCanCommitBeforeReadyFailure");
shard.tell(new CanCommitTransaction(nextTransactionId(), CURRENT_VERSION).toSerializable(), testKit.getRef());
- testKit.expectMsgClass(testKit.duration("5 seconds"), akka.actor.Status.Failure.class);
+ testKit.expectMsgClass(Duration.ofSeconds(5), akka.actor.Status.Failure.class);
}
@Test
ShardTestKit.waitUntilLeader(shard);
- final FiniteDuration duration = testKit.duration("5 seconds");
- final Timeout timeout = new Timeout(duration);
+ final Duration duration = Duration.ofSeconds(5);
+ final Timeout timeout = Timeout.create(duration);
// Ready 2 transactions - the first one will be aborted.
// Wait for the 2nd Tx to complete the canCommit phase.
- canCommitReply = (CanCommitTransactionReply) Await.result(canCommitFuture, duration);
+ canCommitReply = (CanCommitTransactionReply) Await.result(canCommitFuture,
+ FiniteDuration.create(5, TimeUnit.SECONDS));
assertTrue("Can commit", canCommitReply.getCanCommit());
}
ShardTestKit.waitUntilLeader(shard);
- final FiniteDuration duration = testKit.duration("5 seconds");
+ final Duration duration = Duration.ofSeconds(5);
// Ready a tx.
ShardTestKit.waitUntilLeader(shard);
- final FiniteDuration duration = testKit.duration("5 seconds");
+ final Duration duration = Duration.ofSeconds(5);
// Ready 3 tx's.
}
}
- final ShardTestKit testKit = new ShardTestKit(getSystem());
-
final Creator<Shard> creator = () -> new TestShard(newShardBuilder());
- final TestActorRef<Shard> shard = actorFactory.createTestActor(Props
- .create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()),
- shardActorName);
+ final TestActorRef<Shard> shard = actorFactory.createTestActor(Props.create(Shard.class,
+ new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()), shardActorName);
ShardTestKit.waitUntilLeader(shard);
writeToStore(shard, TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME));
- final NormalizedNode<?, ?> expectedRoot = readStore(shard, YangInstanceIdentifier.EMPTY);
+ final NormalizedNode<?, ?> expectedRoot = readStore(shard, YangInstanceIdentifier.empty());
// Trigger creation of a snapshot by ensuring
final RaftActorContext raftActorContext = ((TestShard) shard.underlyingActor()).getRaftActorContext();
commitTransaction(store, putTransaction);
- final NormalizedNode<?, ?> expected = readStore(store, YangInstanceIdentifier.EMPTY);
+ final NormalizedNode<?, ?> expected = readStore(store, YangInstanceIdentifier.empty());
final DataTreeModification writeTransaction = store.takeSnapshot().newModification();
- writeTransaction.delete(YangInstanceIdentifier.EMPTY);
- writeTransaction.write(YangInstanceIdentifier.EMPTY, expected);
+ writeTransaction.delete(YangInstanceIdentifier.empty());
+ writeTransaction.write(YangInstanceIdentifier.empty(), expected);
commitTransaction(store, writeTransaction);
- final NormalizedNode<?, ?> actual = readStore(store, YangInstanceIdentifier.EMPTY);
+ final NormalizedNode<?, ?> actual = readStore(store, YangInstanceIdentifier.empty());
assertEquals(expected, actual);
}
testKit.waitUntilNoLeader(shard);
shard.tell(new RegisterDataTreeChangeListener(TestModel.TEST_PATH, dclActor, true), testKit.getRef());
- final RegisterDataTreeNotificationListenerReply reply = testKit.expectMsgClass(testKit.duration("5 seconds"),
+ final RegisterDataTreeNotificationListenerReply reply = testKit.expectMsgClass(Duration.ofSeconds(5),
RegisterDataTreeNotificationListenerReply.class);
assertNotNull("getListenerRegistrationPath", reply.getListenerRegistrationPath());
testKit.waitUntilNoLeader(shard);
shard.tell(new RegisterDataTreeChangeListener(TestModel.TEST_PATH, dclActor, true), testKit.getRef());
- final RegisterDataTreeNotificationListenerReply reply = testKit.expectMsgClass(testKit.duration("5 seconds"),
+ final RegisterDataTreeNotificationListenerReply reply = testKit.expectMsgClass(Duration.ofSeconds(5),
RegisterDataTreeNotificationListenerReply.class);
assertNotNull("getListenerRegistrationPath", reply.getListenerRegistrationPath());
actorFactory.generateActorId(testName + "-DataTreeChangeListener"));
followerShard.tell(new RegisterDataTreeChangeListener(TestModel.TEST_PATH, dclActor, true), testKit.getRef());
- final RegisterDataTreeNotificationListenerReply reply = testKit.expectMsgClass(testKit.duration("5 seconds"),
+ final RegisterDataTreeNotificationListenerReply reply = testKit.expectMsgClass(Duration.ofSeconds(5),
RegisterDataTreeNotificationListenerReply.class);
assertNotNull("getListenerRegistrationPath", reply.getListenerRegistrationPath());
Code Review / controller.git / blobdiff