Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG-7033: Allow ShardDataTree to pipeline transactions
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
ShardTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java
index 8310e067c5fa002ed52b53e932b58e076aec4a76..f6f6c26c1ed59a77eef354ee2832b01649852fcc 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java
@@
-87,7
+87,6
@@
import org.opendaylight.controller.cluster.notifications.RegisterRoleChangeListe
import org.opendaylight.controller.cluster.notifications.RegisterRoleChangeListenerReply;
import org.opendaylight.controller.cluster.raft.RaftActorContext;
import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry;
import org.opendaylight.controller.cluster.notifications.RegisterRoleChangeListenerReply;
import org.opendaylight.controller.cluster.raft.RaftActorContext;
import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry;
-import org.opendaylight.controller.cluster.raft.ReplicatedLogImplEntry;
import org.opendaylight.controller.cluster.raft.Snapshot;
import org.opendaylight.controller.cluster.raft.base.messages.ApplySnapshot;
import org.opendaylight.controller.cluster.raft.base.messages.ApplyState;
import org.opendaylight.controller.cluster.raft.Snapshot;
import org.opendaylight.controller.cluster.raft.base.messages.ApplySnapshot;
import org.opendaylight.controller.cluster.raft.base.messages.ApplyState;
@@
-101,6
+100,7
@@
import org.opendaylight.controller.cluster.raft.client.messages.OnDemandRaftStat
import org.opendaylight.controller.cluster.raft.messages.RequestVote;
import org.opendaylight.controller.cluster.raft.messages.ServerRemoved;
import org.opendaylight.controller.cluster.raft.persisted.ApplyJournalEntries;
import org.opendaylight.controller.cluster.raft.messages.RequestVote;
import org.opendaylight.controller.cluster.raft.messages.ServerRemoved;
import org.opendaylight.controller.cluster.raft.persisted.ApplyJournalEntries;
+import org.opendaylight.controller.cluster.raft.persisted.SimpleReplicatedLogEntry;
import org.opendaylight.controller.cluster.raft.policy.DisableElectionsRaftPolicy;
import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload;
import org.opendaylight.controller.cluster.raft.utils.InMemoryJournal;
import org.opendaylight.controller.cluster.raft.policy.DisableElectionsRaftPolicy;
import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload;
import org.opendaylight.controller.cluster.raft.utils.InMemoryJournal;
@@
-490,7
+490,7
@@
public class ShardTest extends AbstractShardTest {
final TransactionIdentifier tx = nextTransactionId();
final ApplyState applyState = new ApplyState(null, tx,
final TransactionIdentifier tx = nextTransactionId();
final ApplyState applyState = new ApplyState(null, tx,
- new
ReplicatedLogImpl
Entry(1, 2, payloadForModification(store, writeMod, tx)));
+ new
SimpleReplicatedLog
Entry(1, 2, payloadForModification(store, writeMod, tx)));
shard.tell(applyState, shard);
shard.tell(applyState, shard);
@@
-519,7
+519,7
@@
public class ShardTest extends AbstractShardTest {
InMemoryJournal.addEntry(shardID.toString(), 0, DUMMY_DATA);
// Set up the InMemoryJournal.
InMemoryJournal.addEntry(shardID.toString(), 0, DUMMY_DATA);
// Set up the InMemoryJournal.
- InMemoryJournal.addEntry(shardID.toString(), 1, new
ReplicatedLogImpl
Entry(0, 1,
+ InMemoryJournal.addEntry(shardID.toString(), 1, new
SimpleReplicatedLog
Entry(0, 1,
payloadForModification(source, writeMod, nextTransactionId())));
final int nListEntries = 16;
payloadForModification(source, writeMod, nextTransactionId())));
final int nListEntries = 16;
@@
-536,7
+536,7
@@
public class ShardTest extends AbstractShardTest {
mod.merge(path, ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, i));
mod.ready();
mod.merge(path, ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, i));
mod.ready();
- InMemoryJournal.addEntry(shardID.toString(), i + 1, new
ReplicatedLogImpl
Entry(i, 1,
+ InMemoryJournal.addEntry(shardID.toString(), i + 1, new
SimpleReplicatedLog
Entry(i, 1,
payloadForModification(source, mod, nextTransactionId())));
}
payloadForModification(source, mod, nextTransactionId())));
}
@@
-1345,8
+1345,12
@@
public class ShardTest extends AbstractShardTest {
final InOrder inOrder = inOrder(dataTree);
inOrder.verify(dataTree).validate(any(DataTreeModification.class));
inOrder.verify(dataTree).prepare(any(DataTreeModification.class));
final InOrder inOrder = inOrder(dataTree);
inOrder.verify(dataTree).validate(any(DataTreeModification.class));
inOrder.verify(dataTree).prepare(any(DataTreeModification.class));
+
+ // FIXME: this invocation is done on the result of validate(). To test it, we need to make sure mock
+ // validate performs wrapping and we capture that mock
+ // inOrder.verify(dataTree).validate(any(DataTreeModification.class));
+
inOrder.verify(dataTree).commit(any(DataTreeCandidate.class));
inOrder.verify(dataTree).commit(any(DataTreeCandidate.class));
- inOrder.verify(dataTree).validate(any(DataTreeModification.class));
}
};
}
}
};
}