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 akka.pattern.Patterns;
import akka.testkit.TestActorRef;
import akka.util.Timeout;
-import com.google.common.base.Optional;
import com.google.common.primitives.UnsignedLong;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Uninterruptibles;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.util.Optional;
import java.util.Set;
+import java.util.SortedSet;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNode;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateTip;
+import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException;
import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.TipProducingDataTree;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType;
import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
import scala.concurrent.Await;
import scala.concurrent.Future;
-import scala.concurrent.duration.Duration;
+import scala.concurrent.duration.FiniteDuration;
/**
* Abstract base for shard unit tests.
* @author Thomas Pantelis
*/
public abstract class AbstractShardTest extends AbstractActorTest {
- protected static final SchemaContext SCHEMA_CONTEXT = TestModel.createTestContext();
+ protected static final EffectiveModelContext SCHEMA_CONTEXT = TestModel.createTestContext();
private static final AtomicInteger NEXT_SHARD_NUM = new AtomicInteger();
}
};
- final TestActorRef<Shard> shard = TestActorRef.create(getSystem(),
- Props.create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()),
- "testRecovery");
+ final TestActorRef<Shard> shard = TestActorRef.create(getSystem(), Props.create(Shard.class,
+ 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.
Assert.fail(String.format("Expected last applied: %d, Actual: %d", expectedValue, lastApplied));
}
- protected TipProducingDataTree createDelegatingMockDataTree() throws Exception {
- TipProducingDataTree actual = InMemoryDataTreeFactory.getInstance().create(TreeType.CONFIGURATION);
- final TipProducingDataTree mock = mock(TipProducingDataTree.class);
+ protected DataTree createDelegatingMockDataTree() throws Exception {
+ final DataTree actual = new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_CONFIGURATION);
+ 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.setEffectiveModelContext(invocation.getArgument(0));
return null;
- }).when(mock).setSchemaContext(any(SchemaContext.class));
+ }).when(mock).setEffectiveModelContext(any(EffectiveModelContext.class));
doAnswer(invocation -> actual.takeSnapshot()).when(mock).takeSnapshot();
final boolean doCommitOnReady) {
final BatchedModifications batchedModifications = new BatchedModifications(transactionID, CURRENT_VERSION);
batchedModifications.addModification(modification);
- batchedModifications.setReady(true);
+ batchedModifications.setReady();
batchedModifications.setDoCommitOnReady(doCommitOnReady);
batchedModifications.setTotalMessagesSent(1);
return batchedModifications;
ReadWriteShardDataTreeTransaction rwTx = shard.underlyingActor().getDataStore()
.newReadWriteTransaction(transactionID);
rwTx.getSnapshot().write(path, data);
- return new ForwardedReadyTransaction(transactionID, CURRENT_VERSION, rwTx, doCommitOnReady);
+ return new ForwardedReadyTransaction(transactionID, CURRENT_VERSION, rwTx, doCommitOnReady, Optional.empty());
}
public static NormalizedNode<?,?> readStore(final TestActorRef<? extends Shard> shard,
- final YangInstanceIdentifier id) throws ExecutionException, InterruptedException {
- return shard.underlyingActor().getDataStore().readNode(id).orNull();
+ final YangInstanceIdentifier id) {
+ return shard.underlyingActor().getDataStore().readNode(id).orElse(null);
}
public static NormalizedNode<?,?> readStore(final DataTree store, final YangInstanceIdentifier id) {
- return store.takeSnapshot().readNode(id).orNull();
+ return store.takeSnapshot().readNode(id).orElse(null);
}
public void writeToStore(final TestActorRef<Shard> shard, final YangInstanceIdentifier id,
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);
}
final NormalizedNode<?,?> node) throws DataValidationFailedException {
final BatchedModifications batched = new BatchedModifications(nextTransactionId(), CURRENT_VERSION);
batched.addModification(new MergeModification(id, node));
- batched.setReady(true);
+ batched.setReady();
batched.setDoCommitOnReady(true);
batched.setTotalMessagesSent(1);
}
DataTree setupInMemorySnapshotStore() throws DataValidationFailedException {
- final DataTree testStore = InMemoryDataTreeFactory.getInstance().create(TreeType.OPERATIONAL);
- testStore.setSchemaContext(SCHEMA_CONTEXT);
+ final DataTree testStore = new InMemoryDataTreeFactory().create(
+ DataTreeConfiguration.DEFAULT_OPERATIONAL, SCHEMA_CONTEXT);
writeToStore(testStore, TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME));
- final NormalizedNode<?, ?> root = readStore(testStore, YangInstanceIdentifier.EMPTY);
+ final NormalizedNode<?, ?> root = readStore(testStore, YangInstanceIdentifier.empty());
InMemorySnapshotStore.addSnapshot(shardID.toString(), Snapshot.create(
new ShardSnapshotState(new MetadataShardDataTreeSnapshot(root)),
final boolean doCommitOnReady, final int messagesSent) {
final BatchedModifications batched = new BatchedModifications(transactionID, CURRENT_VERSION);
batched.addModification(new WriteModification(path, data));
- batched.setReady(ready);
+ if (ready) {
+ batched.setReady();
+ }
batched.setDoCommitOnReady(doCommitOnReady);
batched.setTotalMessagesSent(messagesSent);
return batched;
}
+ static BatchedModifications newReadyBatchedModifications(final TransactionIdentifier transactionID,
+ final YangInstanceIdentifier path, final NormalizedNode<?, ?> data,
+ final SortedSet<String> participatingShardNames) {
+ final BatchedModifications batched = new BatchedModifications(transactionID, CURRENT_VERSION);
+ batched.addModification(new WriteModification(path, data));
+ batched.setReady(Optional.of(participatingShardNames));
+ batched.setTotalMessagesSent(1);
+ return batched;
+ }
+
@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",
final DataTreeCandidateTip mockCandidate = mock(DataTreeCandidateTip.class, name);
final DataTreeCandidateNode mockCandidateNode = mock(DataTreeCandidateNode.class, name + "-node");
doReturn(ModificationType.UNMODIFIED).when(mockCandidateNode).getModificationType();
- doReturn(YangInstanceIdentifier.EMPTY).when(mockCandidate).getRootPath();
+ doReturn(YangInstanceIdentifier.empty()).when(mockCandidate).getRootPath();
doReturn(mockCandidateNode).when(mockCandidate).getRootNode();
return mockCandidate;
}
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;
}
public State getState() {
return delegate.getState();
}
+
+ @Override
+ Optional<SortedSet<String>> getParticipatingShardNames() {
+ return delegate.getParticipatingShardNames();
+ }
}
}
Code Review / controller.git / blobdiff